summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-10 03:04:45 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-12 14:59:06 +0300
commitfa6c5e676726d12d0a1a34de5a1fa249b3c356d2 (patch)
tree74793780755bf8e316569c94b11070855f27aa67
parent59ec9cc506f74b471e45bc75fafd8bb762ae0c12 (diff)
rz-mux: x.rhizi.net.conf: define rzi_webapp
-rw-r--r--res/rz-mux/apache-conf-template.d/x.rhizi.net.conf11
1 files changed, 6 insertions, 5 deletions
diff --git a/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf b/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf
index 58c9e8c7..f6adf4c1 100644
--- a/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf
+++ b/res/rz-mux/apache-conf-template.d/x.rhizi.net.conf
@@ -1,10 +1,11 @@
<VirtualHost *:80>
- Define rzi_root /srv/www/rhizi/mux-root.d/{{ domain_fqdn }}/webapp
- Define rzi_fragment.d ${rzi_root}/fragment.d
+ Define rzi_root /srv/www/rhizi/mux-root.d/{{ domain_fqdn }}
+ Define rzi_webapp ${rzi_root}/webapp
+ Define rzi_fragment_d ${rzi_webapp}/fragment.d
ServerName {{ domain_fqdn }}
- DocumentRoot ${rzi_root}
+ DocumentRoot ${rzi_webapp}
LogLevel info
ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -20,7 +21,7 @@
#
# Temporary fix until #529 is implemented
ProxyPass /static/js/model/domain_types.js !
- Alias /static/js/model/domain_types.js ${rzi_fragment.d}/js/domain_types.js
+ Alias /static/js/model/domain_types.js ${rzi_fragment_d}/js/domain_types.js
ProxyRequests Off
ProxyPreserveHost On
@@ -32,7 +33,7 @@
Require all denied
</Directory>
- <Directory /srv/www/rhizi/mux-root.d/{{ domain_fqdn }}/webapp >
+ <Directory ${rzi_webapp} >
Options +FollowSymLinks
Require all granted