diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-01 02:34:29 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-01 03:17:30 +0300 |
| commit | 49716b975c9aef38b16c4e6c6d95f61cfafe5ccb (patch) | |
| tree | a3dafc5d25b5411430184b9b0c1921d1fb4cb46e | |
| parent | 8c6a6cae1b6fc1813047fecbd89d59191b34d81e (diff) | |
rz-mux-tool: rzi-overrides > rzi-override.d
| -rw-r--r-- | res/rz-mux/apache-conf-template.d/x.rhizi.net.conf | 4 | ||||
| -rw-r--r-- | src/local/rz-mux/rz-mux-tool.sh | 6 |
2 files changed, 5 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 c8c0957e..19a2984e 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 @@ -19,11 +19,11 @@ # # 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 + Alias /static/js/model/domain_types.js ${rzi_root}/static/rzi-override.d/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 + Alias /templates/fragment/ ${rzi_root}/rzi-override.d/templates/fragment ProxyRequests Off ProxyPreserveHost On diff --git a/src/local/rz-mux/rz-mux-tool.sh b/src/local/rz-mux/rz-mux-tool.sh index e5f014f2..66a0cf7e 100644 --- a/src/local/rz-mux/rz-mux-tool.sh +++ b/src/local/rz-mux/rz-mux-tool.sh @@ -98,8 +98,8 @@ install_instance__apache() { install -v --owner=${APACHE_USER} --group=${APACHE_USER} --directory ${apache_module__rootdir} \ --directory ${apache_module__rootdir}/webapp \ --directory ${apache_module__rootdir}/webapp/static \ - --directory ${apache_module__rootdir}/webapp/static/rzi-overrides/js \ - --directory ${apache_module__rootdir}/webapp/static/rzi-overrides/templates/fragment \ + --directory ${apache_module__rootdir}/webapp/static/rzi-override.d/js \ + --directory ${apache_module__rootdir}/webapp/static/rzi-override.d/templates/fragment \ --directory ${apache_module__rootdir}/auth ln -vfs -T /etc/rhizi/mux-conf.d/${RZI_NAME} ${apache_module__rootdir}/webapp/etc @@ -197,7 +197,7 @@ case $1 in echo "# - /etc/rhizi/mux-conf.d/${RZI_NAME}/rhizi-server.conf" echo "#" echo "# [!] populate instance-specific overrides here:" - echo "# - ${apache_module__rootdir}/webapp/static/rzi-overrides/*" + echo "# - ${apache_module__rootdir}/webapp/static/rzi-override.d/*" echo "#" ;; uninstall) |