diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-05-01 02:06:41 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-05-01 03:17:30 +0300 |
| commit | 7f7ccb9352ce9acb48c81d7f796787bb48c87921 (patch) | |
| tree | e63fd5c5ac6537c11cd5c678f0d12430a2acd54f /res/rz-mux/apache-conf-template.d | |
| parent | 1831e3b807045e9259c694a713f701555eacb9bc (diff) | |
rz-mux-tool: rename domain_name -> domain_fqdn
Diffstat (limited to 'res/rz-mux/apache-conf-template.d')
| -rw-r--r-- | res/rz-mux/apache-conf-template.d/x.rhizi.net.conf | 18 |
1 files changed, 12 insertions, 6 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 30368d1b..dc093eed 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,13 +1,13 @@ <VirtualHost *:80> - Define rzi_root /srv/www/rhizi/mux-root.d/{{ domain_name }}/webapp + Define rzi_root /srv/www/rhizi/mux-root.d/{{ domain_fqdn }}/webapp - ServerName {{ domain_name }}.rhizi.net + ServerName {{ domain_fqdn }} DocumentRoot ${rzi_root} LogLevel info ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access_{{ domain_name }}.rhizi.net.log combined + CustomLog ${APACHE_LOG_DIR}/access_{{ domain_fqdn }}.log combined SetOutputFilter DEFLATE @@ -19,7 +19,7 @@ ProxyPreserveHost On ProxyPass /socket.io/ ws://127.0.0.1:{{ rz_port__http }}/socket.io/ ProxyPass / http://127.0.0.1:{{ rz_port__http }}/ - ProxyPassReverse / http://{{ domain_name }}.rhizi.net/ + ProxyPassReverse / http://{{ domain_fqdn }}.rhizi.net/ # Temporary fix until #529 is implemented ProxyPass /static/js/model/domain_types.js ! @@ -29,11 +29,17 @@ ProxyPass /templates/fragment/ ! Alias /templates/fragment/ ${rzi_root}/rzi-overrides/templates/fragment - <Directory /srv/www/rhizi/mux-root.d/{{ domain_name }}/auth > + ProxyRequests Off + ProxyPreserveHost On + ProxyPass /socket.io/ ws://127.0.0.1:{{ rz_port__http }}/socket.io/ + ProxyPass / http://127.0.0.1:{{ rz_port__http }}/ + ProxyPassReverse / http://{{ domain_fqdn }}/ + + <Directory /srv/www/rhizi/mux-root.d/{{ domain_fqdn }}/auth > Require all denied </Directory> - <Directory /srv/www/rhizi/mux-root.d/{{ domain_name }}/webapp > + <Directory /srv/www/rhizi/mux-root.d/{{ domain_fqdn }}/webapp > Options +FollowSymLinks Require all granted |