From fa6c5e676726d12d0a1a34de5a1fa249b3c356d2 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 10 May 2015 03:04:45 +0300
Subject: rz-mux: x.rhizi.net.conf: define rzi_webapp

---
 res/rz-mux/apache-conf-template.d/x.rhizi.net.conf | 11 ++++++-----
 1 file 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
-- 
cgit v1.3.1