Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 85f6a61..f390072 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -46,14 +46,14 @@ export DIST_CONF = ${FREESIDE_CONF}/default_conf
 #export MASON_HANDLER          = /usr/share/freeside/handler.pl
 export MASON_HANDLER=$(TMP)-webui/usr/local/etc/freeside/handler.pl
 
-#export FREESIDE_DOCUMENT_ROOT = /usr/share/freeside/www
-export APACHE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www')
+export APACHE_VERSION        := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2')
+export APACHE_DOCUMENT_ROOT  := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www')
 export FREESIDE_DOCUMENT_ROOT = $(TMP)$(APACHE_DOCUMENT_ROOT)/freeside
 export INIT_FILE              = $(TMP).init
 export INIT_INSTALL           = /bin/true
 export HTTPD_RESTART          = /bin/true
-#export APACHE_CONF           = /etc/apache2/conf.d
-export APACHE_CONF            = $(TMP)-webui/etc/freeside/apache2
+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?
@@ -180,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
@@ -226,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; \