X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Frules;h=f390072408139d23f508b6f0587c3bf0f3410bc9;hp=e82254e1869f8fec9875cb51d8933a920f5d1bf3;hb=379c06ccd4b984bfa8130d98f862799239a8d00c;hpb=1da8bc3a1229d6e8fae3fde5ad70b297176c285b

diff --git a/debian/rules b/debian/rules
index e82254e18..f39007240 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?
@@ -179,7 +180,7 @@ install-stamp: build-stamp
 
 	perl -p -i -e "\
          s'${TMP}(-webui)?''g;\
-        "  $(TMP)-webui/etc/freeside/apache2/*
+        " $(APACHE_CONF)/*
 
 	# Install init
 	$(MAKE) -e DESTDIR=$(TMP) install-init
@@ -225,6 +226,19 @@ install-stamp: build-stamp
 	install -d ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/
 	cp -R ng_selfservice ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/ng_selfservice-DIST/
 
+	# Torrus 
+	
+	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; \
+	$(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; \