rz-mux-tool: rename domain_name -> domain_fqdn

1 files changed, 20 insertions, 23 deletions

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)