rz-mux-tool: rename domain_name -> domain_fqdn

6 files changed, 44 insertions, 41 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
diff --git a/src/local/rz-mux/rz-mux-tool.py b/src/local/rz-mux/rz-mux-tool.py
index 253475bb..18e2cf44 100644
--- a/src/local/rz-mux/rz-mux-tool.py
+++ b/src/local/rz-mux/rz-mux-tool.py
@@ -30,7 +30,7 @@ class Template_Task():
 
             print('rz-mux-tool: generated: %s' % (f_out.name))
 
-def gen_dom_config__neo4j(domain_name, port_map):
+def gen_dom_config__neo4j(domain_fqdn, port_map):
     """
     Generate domain-specific neo4j configuration file set
     """
@@ -46,42 +46,39 @@ def gen_dom_config__neo4j(domain_name, port_map):
                                    os.path.join(install_prefix, target_dir, 'neo4j.properties'),
                                    {'remote_shell_port': port_map.neo4j_port__shell}),
                      Template_Task(os.path.join(neo4j_template_path_prefix, 'neo4j-service_deomain-init-script.jinja'),
-                                   os.path.join(install_prefix, 'etc/init.d/', 'neo4j-service__%s' % (domain_name)),
-                                   {'domain_name': domain_name}),
+                                   os.path.join(install_prefix, 'etc/init.d/', 'neo4j-service__%s' % (domain_fqdn)),
+                                   {'domain_fqdn': domain_fqdn}),
                      ]
 
     for conf_task_obj in conf_task_set:
         conf_task_obj.do_exec()
 
-def gen_dom_config__apache(domain_name, port_map):
+def gen_dom_config__apache(domain_fqdn, port_map):
     """
     Generate domain-specific neo4j configuration file set
     """
     apache_template_path_prefix = 'apache-conf-template.d'
-    rhizi_top_domain_name = 'rhizi.net'
-    domain_fqdn = '%s.%s' % (domain_name, rhizi_top_domain_name)
+    rhizi_top_domain_fqdn = 'rhizi.net'
 
-    conf_task_set = [Template_Task(os.path.join(apache_template_path_prefix, 'x.%s.conf' % (rhizi_top_domain_name)),
+    conf_task_set = [Template_Task(os.path.join(apache_template_path_prefix, 'x.%s.conf' % (rhizi_top_domain_fqdn)),
                                    os.path.join(install_prefix, 'etc/apache2/sites-available', domain_fqdn + '.conf'),
-                                   {'domain_name': domain_name,
+                                   {'domain_fqdn': domain_fqdn,
                                     'rz_port__http': port_map.rz_port__http}),
                      ]
 
     for conf_task_obj in conf_task_set:
         conf_task_obj.do_exec()
 
-def gen_dom_config__rhizi(domain_name, port_map):
+def gen_dom_config__rhizi(domain_fqdn, port_map):
     rz_template_path_prefix = 'rhizi-conf-template.d'
-    rhizi_top_domain_name = 'rhizi.net'
-    domain_fqdn = '%s.%s' % (domain_name, rhizi_top_domain_name)
 
     rz_server_secret = str(uuid.uuid4()).replace('-', '')
-    root_path = os.path.join('/srv/www/rhizi/mux-root.d/', domain_name, 'webapp')
-    user_db_path = os.path.join('/srv/www/rhizi/mux-root.d/', domain_name, 'auth', 'user_db.db')
+    root_path = os.path.join('/srv/www/rhizi/mux-root.d/', domain_fqdn, 'webapp')
+    user_db_path = os.path.join('/srv/www/rhizi/mux-root.d/', domain_fqdn, 'auth', 'user_db.db')
 
     conf_task_set = [Template_Task(os.path.join(rz_template_path_prefix, 'rhizi-server.conf.jinja'),
-                                   os.path.join(install_prefix, 'etc/rhizi/mux-conf.d', domain_name, 'rhizi-server.conf'),
-                                   {'domain_name': domain_name,
+                                   os.path.join(install_prefix, 'etc/rhizi/mux-conf.d', domain_fqdn, 'rhizi-server.conf'),
+                                   {'domain_fqdn': domain_fqdn,
                                     'neo4j_port__http': port_map.neo4j_port__http,
                                     'root_path': root_path,
                                     'rz_port__http': port_map.rz_port__http,
@@ -89,11 +86,11 @@ def gen_dom_config__rhizi(domain_name, port_map):
                                     'user_db_path': user_db_path,
                                     }),
                      Template_Task(os.path.join(rz_template_path_prefix, 'rhizi.init.jinja'),
-                                   os.path.join(install_prefix, 'etc/init.d/', 'rhizi__%s' % (domain_name)),
-                                   {'domain_name': domain_name}),
+                                   os.path.join(install_prefix, 'etc/init.d/', 'rhizi__%s' % (domain_fqdn)),
+                                   {'domain_fqdn': domain_fqdn}),
                      Template_Task(os.path.join(rz_template_path_prefix, 'rhizi-cron-bkp.daily.sh.jinja'),
-                                   os.path.join(install_prefix, '/etc/cron.daily/', 'rhizi__%s' % (domain_name)),
-                                   {'domain_name': domain_name,
+                                   os.path.join(install_prefix, '/etc/cron.daily/', 'rhizi__%s' % (domain_fqdn)),
+                                   {'domain_fqdn': domain_fqdn,
                                     'neo4j_port__shell': port_map.neo4j_port__shell}),
                      ]
 
@@ -112,7 +109,7 @@ if __name__ == '__main__':
 
     env = Environment(loader=FileSystemLoader(args.template_dir))
     install_prefix = args.install_prefix
-    domain_name = args.domain
+    domain_fqdn = args.domain
 
     #
     # generate optimistic-collision-avoiding instance port map
@@ -124,6 +121,6 @@ if __name__ == '__main__':
     setattr(cfg_port_map, 'neo4j_port__shell', port_seed + 2)
     setattr(cfg_port_map, 'rz_port__http', 48000 + port_seed % 1000)
 
-    gen_dom_config__neo4j(domain_name, cfg_port_map)
-    gen_dom_config__rhizi(domain_name, cfg_port_map)
-    gen_dom_config__apache(domain_name, cfg_port_map)
+    gen_dom_config__neo4j(domain_fqdn, cfg_port_map)
+    gen_dom_config__rhizi(domain_fqdn, cfg_port_map)
+    gen_dom_config__apache(domain_fqdn, cfg_port_map)