rz-mux-tool: rename domain_name -> domain_fqdn

5 files changed, 24 insertions, 18 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
diff --git a/res/rz-mux/neo4j-conf-template.d/neo4j-service_deomain-init-script.jinja b/res/rz-mux/neo4j-conf-template.d/neo4j-service_deomain-init-script.jinja
index a56f3b79..5e5ba4d8 100755
--- a/res/rz-mux/neo4j-conf-template.d/neo4j-service_deomain-init-script.jinja
+++ b/res/rz-mux/neo4j-conf-template.d/neo4j-service_deomain-init-script.jinja
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ### BEGIN INIT INFO
-# Provides:          neo4j__{{ domain_name }}
+# Provides:          neo4j__{{ domain_fqdn }}
 # Required-Start:    $remote_fs $syslog $network
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
@@ -34,11 +34,11 @@
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Neo4j Graph Database"
-NAME=neo4j__{{ domain_name }}
-DAEMON=/var/lib/neo4j/mux-root.d/{{ domain_name }}/bin/neo4j
+NAME=neo4j__{{ domain_fqdn }}
+DAEMON=/var/lib/neo4j/mux-root.d/{{ domain_fqdn }}/bin/neo4j
 DAEMON_ARGS="start"
-PIDFILE=/var/lib/neo4j/mux-root.d/{{ domain_name }}/data/neo4j-service.pid
-SCRIPTNAME=/etc/init.d/neo4j-service__{{ domain_name }}
+PIDFILE=/var/lib/neo4j/mux-root.d/{{ domain_fqdn }}/data/neo4j-service.pid
+SCRIPTNAME=/etc/init.d/neo4j-service__{{ domain_fqdn }}
 
 NEO_USER=neo4j
 
diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja
index ecce23a5..35dac2de 100644
--- a/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja
+++ b/res/rz-mux/rhizi-conf-template.d/rhizi-cron-bkp.daily.sh.jinja
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-bkp_dir=/var/lib/rhizi/mux-bkp.d/{{ domain_name }}
-bkp_filename={{ domain_name }}-bkp_$(date +%Y-%m-%d).dump
+bkp_dir=/var/lib/rhizi/mux-bkp.d/{{ domain_fqdn }}
+bkp_filename={{ domain_fqdn }}-bkp_$(date +%Y-%m-%d).dump
 bkp_filepath=${bkp_dir}/${bkp_filename}
 
 # dump neo4j DB
diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja
index 9a07dc44..a19de2ee 100644
--- a/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja
+++ b/res/rz-mux/rhizi-conf-template.d/rhizi-server.conf.jinja
@@ -17,7 +17,7 @@ static_url_path = /static
 #
 listen_address = 127.0.0.1
 listen_port = {{ rz_port__http }}
-reverse_proxy_host = {{ domain_name }}.rhizi.net
+reverse_proxy_host = {{ domain_fqdn }}.rhizi.net
 reverse_proxy_port = 80
 
 # -----------------------------------------------------------------------------
@@ -29,7 +29,7 @@ neo4j_url = http://127.0.0.1:{{ neo4j_port__http }}
 # Logging
 #
 log_level = debug
-log_path = /var/log/rhizi/rhizi-server__{{ domain_name }}.log
+log_path = /var/log/rhizi/rhizi-server__{{ domain_fqdn }}.log
 
 # -----------------------------------------------------------------------------
 # Flask Configuration
diff --git a/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja b/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja
index 134b5baf..bdbbb648 100644
--- a/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja
+++ b/res/rz-mux/rhizi-conf-template.d/rhizi.init.jinja
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:          rhizi__{{ domain_name }}
+# Provides:          rhizi__{{ domain_fqdn }}
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:     $local_fs $network $syslog
 # Default-Start:     2 3 4 5
@@ -15,14 +15,14 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="rhizi-server"
-NAME=rhizi__{{ domain_name }}
+NAME=rhizi__{{ domain_fqdn }}
 DAEMON=/usr/bin/python2.7
 PIDFILE=/var/run/rhizi/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 USERNAME=www-data
 GROUPNAME=www-data
 
-ARGS__DAEMON="/usr/lib/rhizi/rhizi-server/rz_server.py --config-dir=/etc/rhizi/mux-conf.d/{{ domain_name }}/"
+ARGS__DAEMON="/usr/lib/rhizi/rhizi-server/rz_server.py --config-dir=/etc/rhizi/mux-conf.d/{{ domain_fqdn }}/"
 ARGS__START_STOP_DAEMON="--make-pidfile --background --chuid ${USERNAME}:${GROUPNAME}"
 
 # Exit if the package is not installed