[freeside-commits] branch master updated. 458f6fc84389aa3d4679380bb15aad74bdec0cb3

[Jeremy Davis]

The branch, master has been updated
       via  458f6fc84389aa3d4679380bb15aad74bdec0cb3 (commit)
      from  5725d1464f13906b93aeff9bda372df2ddb2b362 (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 458f6fc84389aa3d4679380bb15aad74bdec0cb3
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Wed Jun 24 16:27:33 2015 -0400

    Ticket #36913 Torrus installation for Debian packages

diff --git a/debian/rules b/debian/rules
index 30bd292..2faf1bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -228,12 +228,17 @@ 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)/
 
 	( cd torrus; \
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure; \
 	$(MAKE) -e DESTDIR=${TMP}-torrus/; \
 	$(MAKE) -e DESTDIR=${TMP}-torrus/ install )
 
+        perl -p -i -e "\
+        s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+        " ${TMP}-torrus/usr/local/etc/torrus/conf/torrus-siteconfig.pl; \
+
 	#RT Config
 
 	( cd rt; \

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

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