From 4f7f23caabcbc84160873e9a5ec53b9cccdbd320 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Thu, 30 Apr 2015 13:46:57 +0300 Subject: rz-mux: apache x.rhizi.net.conf: serve override js, fragments --- res/rz-mux/apache-conf-template.d/x.rhizi.net.conf | 8 ++++++++ src/local/rz-mux/rz-mux-tool.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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 c6536c9b..30368d1b 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 @@ -21,6 +21,14 @@ ProxyPass / http://127.0.0.1:{{ rz_port__http }}/ ProxyPassReverse / http://{{ domain_name }}.rhizi.net/ + # Temporary fix until #529 is implemented + ProxyPass /static/js/model/domain_types.js ! + Alias /static/js/model/domain_types.js ${rzi_root}/static/rzi-overrides/js/domain_types.js + + # Template fragment overrides - comment out this section to use the defaults + ProxyPass /templates/fragment/ ! + Alias /templates/fragment/ ${rzi_root}/rzi-overrides/templates/fragment + Require all denied diff --git a/src/local/rz-mux/rz-mux-tool.sh b/src/local/rz-mux/rz-mux-tool.sh index 16a04496..5e12f403 100644 --- a/src/local/rz-mux/rz-mux-tool.sh +++ b/src/local/rz-mux/rz-mux-tool.sh @@ -181,7 +181,7 @@ case $1 in echo "# [!] please review / adjust the following: echo "# - /etc/rhizi/mux-conf.d/${RZI_NAME}/rhizi-server.conf" echo "#" - echo "# [!] please install instance-specific overrides here: + echo "# [!] populate instance-specific overrides here: echo "# - ${apache_site_root}/webapp/static/rzi-overrides/*" echo "#" ;; -- cgit v1.3.1