diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-04-30 13:46:57 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-01 03:17:30 +0300 |
| commit | 4f7f23caabcbc84160873e9a5ec53b9cccdbd320 (patch) | |
| tree | 630fde664a380583943b463824e0e2104fec317b | |
| parent | addb826631ade6eb753129228d19ac6f89458734 (diff) | |
rz-mux: apache x.rhizi.net.conf: serve override js, fragments
| -rw-r--r-- | res/rz-mux/apache-conf-template.d/x.rhizi.net.conf | 8 | ||||
| -rw-r--r-- | src/local/rz-mux/rz-mux-tool.sh | 2 |
2 files changed, 9 insertions, 1 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 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 + <Directory /srv/www/rhizi/mux-root.d/{{ domain_name }}/auth > Require all denied </Directory> 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 "#" ;; |