From 74edd0fc096c5367ed2a153c7489eeb5ea250657 Mon Sep 17 00:00:00 2001
From: Bruno Clermont <bruno.clermont@gmail.com>
Date: Thu, 8 Dec 2011 22:50:58 -0300
Subject: [PATCH] use more standard filesystem structure, fix python-support

---
 bin/diamond     | 2 +-
 debian/dirs     | 2 ++
 debian/init.d   | 2 +-
 debian/postinst | 3 +++
 debian/postrm   | 3 ++-
 setup.cfg       | 5 ++---
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 debian/dirs

diff --git a/bin/diamond b/bin/diamond
index 69e76021b..55927e93e 100755
--- a/bin/diamond
+++ b/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")
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 000000000..f1461edd2
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+etc/diamond/collectors
+var/log/diamond
diff --git a/debian/init.d b/debian/init.d
index 493b08c05..825772bf9 100644
--- a/debian/init.d
+++ b/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
diff --git a/debian/postinst b/debian/postinst
index 634f35fe8..84b81bf21 100644
--- a/debian/postinst
+++ b/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)
diff --git a/debian/postrm b/debian/postrm
index d555b3dfe..74900cc25 100644
--- a/debian/postrm
+++ b/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)
diff --git a/setup.cfg b/setup.cfg
index 5bb58958b..5065a7b58 100644
--- a/setup.cfg
+++ b/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