From 250064c06b75b0accaf597f3c82f1318646d32b2 Mon Sep 17 00:00:00 2001 From: Jeremy Davis Date: Thu, 25 Jun 2015 11:54:44 -0400 Subject: [PATCH] Ticket #36913 Fix Apache config --- debian/rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 3181fe882..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? @@ -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; \ -- 2.11.0