projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
181fb24
)
Ticket #36913 Fix Apache config
author
Jeremy Davis
<jeremyd@freeside.biz>
Thu, 25 Jun 2015 15:54:44 +0000
(11:54 -0400)
committer
Jeremy Davis
<jeremyd@freeside.biz>
Thu, 25 Jun 2015 15:54:44 +0000
(11:54 -0400)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index
3181fe8
..
f390072
100755
(executable)
--- 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 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?
export FREESIDE_RESTART = /bin/true
#XXX root?
@@
-227,8
+228,8
@@
install-stamp: build-stamp
# Torrus
# Torrus
- install -d ${T
MP}-torrus${APACHE
_CONF}
- install -o root -m 755 htetc/freeside-torrus.conf $
{TMP}-torrus$(APACHE
_CONF)/
+ install -d ${T
ORRUS
_CONF}
+ install -o root -m 755 htetc/freeside-torrus.conf $
(TORRUS
_CONF)/
( cd torrus; \
torrus_user=freeside var_user=freeside var_group=freeside ./configure; \
( cd torrus; \
torrus_user=freeside var_user=freeside var_group=freeside ./configure; \