From: Jeremy Davis <jeremyd@freeside.biz>
Date: Thu, 25 Jun 2015 15:15:47 +0000 (-0400)
Subject: Ticket #36913 Correct config file and automate post install tasks
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=181fb248cd7b90a9f53f018a2ea24225585cf5ee

Ticket #36913 Correct config file and automate post install tasks
---

diff --git a/debian/freeside-torrus.postinst b/debian/freeside-torrus.postinst
new file mode 100644
index 000000000..4cc54872a
--- /dev/null
+++ b/debian/freeside-torrus.postinst
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+chown freeside.freeside /var/log/torrus
+mkdir /srv/torrus/; mkdir /srv/torrus/collector_rrd
+chown -R freeside:freeside /srv/torrus/collector_rrd /usr/local/etc/torrus/discovery /usr/local/etc/torrus/xmlconfig/
+torrus clearcache
diff --git a/debian/rules b/debian/rules
index 45f2ce8ed..3181fe882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -227,8 +227,8 @@ install-stamp: build-stamp
 
 	# Torrus 
 	
-	install -d ${TMP}-torrus$(APACHE_DOCUMENT_ROOT)/
-	install -o root -m 755 htetc/freeside-torrus.conf ${TMP}-torrus$(APACHE_DOCUMENT_ROOT)/
+	install -d ${TMP}-torrus${APACHE_CONF}
+	install -o root -m 755 htetc/freeside-torrus.conf ${TMP}-torrus$(APACHE_CONF)/
 
 	( cd torrus; \
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure; \