[freeside-commits] branch master updated. 181fb248cd7b90a9f53f018a2ea24225585cf5ee

[Jeremy Davis]

The branch, master has been updated
       via  181fb248cd7b90a9f53f018a2ea24225585cf5ee (commit)
      from  a80507837e7edee6e06206fdda466a9cf7391566 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 181fb248cd7b90a9f53f018a2ea24225585cf5ee
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Thu Jun 25 11:15:47 2015 -0400

    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 0000000..4cc5487
--- /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 45f2ce8..3181fe8 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; \

-----------------------------------------------------------------------

Summary of changes:
 debian/freeside-torrus.postinst |    6 ++++++
 debian/rules                    |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 debian/freeside-torrus.postinst