From 7f7ccb9352ce9acb48c81d7f796787bb48c87921 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Fri, 1 May 2015 02:06:41 +0300 Subject: rz-mux-tool: rename domain_name -> domain_fqdn --- res/rz-mux/apache-conf-template.d/x.rhizi.net.conf | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'res/rz-mux/apache-conf-template.d') 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 @@ - 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 - + 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 }}/ + + Require all denied - + Options +FollowSymLinks Require all granted -- cgit v1.3.1