use more standard filesystem structure, fix python-support

bin/diamond

@@ -45,7 +45,7 @@ import signal
 def main():
     # Initialize Options
     parser = optparse.OptionParser()
-    parser.add_option("-c", "--configfile", dest="configfile", default="/opt/diamond/conf/diamond.conf", help="config file")
+    parser.add_option("-c", "--configfile", dest="configfile", default="/etc/diamond/diamond.conf", help="config file")
     parser.add_option("-l", "--logfile", dest="logfile", default=None, help="log file")
     parser.add_option("-f", "--foreground", dest="foreground", default=False, action="store_true", help="run in foreground")
     parser.add_option("-p", "--pidfile", dest="pidfile", default=None, help="pid file")

debian/dirs

@@ -0,0 +1,2 @@
+etc/diamond/collectors
+var/log/diamond

debian/init.d

@@ -17,7 +17,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC=diamond
 NAME=diamond
-DAEMON=/opt/diamond/bin/diamond
+DAEMON=/usr/bin/diamond
 DAEMON_ARGS="-p /var/run/diamond.pid"
 PIDFILE=/var/run/diamond.pid
 SCRIPTNAME=/etc/init.d/diamond

debian/postinst

@@ -20,6 +20,9 @@ set -e
 
 case "$1" in
     configure)
+        if ! getent passwd diamond >/dev/null; then
+            adduser --quiet --system --no-create-home --home /var/log/diamond --shell /usr/sbin/nologin diamond
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/postrm

@@ -21,7 +21,8 @@ set -e
 
 case "$1" in
     purge)
-        [ -d /opt/diamond ] && rm -rf /opt/diamond
+        [ -d /var/log/diamond ] && rm -rf /var/log/diamond
+        [ -d /etc/diamond ] && rm -rf /etc/diamond
     ;;
 
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

setup.cfg

@@ -1,4 +1,3 @@
 [install]
-prefix = /opt/diamond
-install-lib = %(prefix)s/lib
-install-data = %(prefix)s
+prefix = /usr
+install-data = %(prefix)s/share/diamond