[freeside-commits] branch master updated. 1da8bc3a1229d6e8fae3fde5ad70b297176c285b

[Jeremy Davis]

The branch, master has been updated
       via  1da8bc3a1229d6e8fae3fde5ad70b297176c285b (commit)
      from  88e71e16110306c7a8d5900aecd05e932c9dbfae (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 1da8bc3a1229d6e8fae3fde5ad70b297176c285b
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Tue May 26 13:40:39 2015 -0400

    Debian package changes

diff --git a/debian/rules b/debian/rules
index 85f6a61..e82254e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,14 +46,13 @@ 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 FREESIDE_RESTART       = /bin/true
 
 #XXX root?

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

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