[freeside-commits] branch FREESIDE_3_BRANCH updated. 9cfddf73b91379c51da4caacf7da2e2f64558e0a

[Jeremy Davis]

The branch, FREESIDE_3_BRANCH has been updated
       via  9cfddf73b91379c51da4caacf7da2e2f64558e0a (commit)
      from  4ca0be874312448d3fd8948b97f056e9689d1b28 (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 9cfddf73b91379c51da4caacf7da2e2f64558e0a
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Thu Jun 25 11:57:08 2015 -0400

    Ticket #36913 Fix Apache config

diff --git a/debian/rules b/debian/rules
index 3181fe8..f390072 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ export INIT_FILE              = $(TMP).init
 export INIT_INSTALL           = /bin/true
 export HTTPD_RESTART          = /bin/true
 export APACHE_CONF           := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-webui/etc/apache2/conf-available" || echo "$(TMP)-webui/etc/apache2/conf.d")
+export TORRUS_CONF           := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-torrus/etc/apache2/conf-available" || echo "$(TMP)-torrus/etc/apache2/conf.d")
 export FREESIDE_RESTART       = /bin/true
 
 #XXX root?
@@ -227,8 +228,8 @@ install-stamp: build-stamp
 
 	# Torrus 
 	
-	install -d ${TMP}-torrus${APACHE_CONF}
-	install -o root -m 755 htetc/freeside-torrus.conf ${TMP}-torrus$(APACHE_CONF)/
+	install -d ${TORRUS_CONF}
+	install -o root -m 755 htetc/freeside-torrus.conf $(TORRUS_CONF)/
 
 	( cd torrus; \
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure; \

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

Summary of changes:
 debian/rules |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)