rz-mux-tool.sh: handle dir creation exclusively

2 files changed, 13 insertions, 14 deletions

diff --git a/src/local/rz-mux/rz-mux-tool.py b/src/local/rz-mux/rz-mux-tool.py
index 590d53c4..253475bb 100644
--- a/src/local/rz-mux/rz-mux-tool.py
+++ b/src/local/rz-mux/rz-mux-tool.py
@@ -1,8 +1,11 @@
 """
  Multiplexed-Rhizi instance configuration generator:
-    - setup Apache instance configuration
-    - setup Neo4J instance,  instance configuration
-    - setup Rhizi instance configuration
+    - generate Apache instance configuration files
+    - generate Neo4J instance,  instance configuration files
+    - generate Rhizi instance configuration files
+
+ This tool currently does not handle module confdir/rootdir creation, file mode/ownership creation,
+ which are handled by the .sh accompanying shell script.
 """
 import argparse
 from jinja2 import Environment, FileSystemLoader
@@ -22,11 +25,6 @@ class Template_Task():
 
     def do_exec(self):
 
-        dst_dir = os.path.dirname(self.dst_path)
-        if not os.path.exists(dst_dir):
-            print('rz-mux-tool: warning: target dir missing, installing: %s, please adjust usr/grp' % (dst_dir))
-            os.makedirs(dst_dir)
-
         with open(self.dst_path, 'w') as f_out:
             f_out.write(self.jinja_tmpl.render(**self.kv_set))
 
diff --git a/src/local/rz-mux/rz-mux-tool.sh b/src/local/rz-mux/rz-mux-tool.sh
index 681690b5..e5f014f2 100644
--- a/src/local/rz-mux/rz-mux-tool.sh
+++ b/src/local/rz-mux/rz-mux-tool.sh
@@ -89,8 +89,6 @@ install_instance__neo4j() {
     ln -vfs -T /usr/share/neo4j/plugins            ${neo4j_module__rootdir}/plugins
     ln -vfs -T /usr/share/neo4j/system             ${neo4j_module__rootdir}/system
 
-    # set modes, ownership
-    chmod +x ${RZI_NEO4J_INIT_SCRIPT_PATH}
 }
 
 install_instance__apache() {
@@ -122,7 +120,6 @@ install_instance__rhizi() {
     install -v --directory ${rz_module__confdir} \
                --directory ${rz_module__bkp}
 
-    chmod +x /etc/init.d/rhizi__${RZI_NAME}
 }
 
 uninstall_instance__apache() {
@@ -172,13 +169,17 @@ case $1 in
 
         set -e
 
+        install_instance__apache
+        install_instance__neo4j
+        install_instance__rhizi
+
         python /usr/lib/rhizi/tools/rz-mux/rz-mux-tool.py \
                --template-dir /usr/share/rhizi/rz-mux/ \
                --domain ${RZI_NAME}
 
-        install_instance__apache
-        install_instance__neo4j
-        install_instance__rhizi
+        # set modes, ownership
+        chmod +x ${RZI_NEO4J_INIT_SCRIPT_PATH}
+        chmod +x /etc/init.d/rhizi__${RZI_NAME}
 
         tree -ug --noreport /etc/apache2/sites-available
         tree -ug --noreport /etc/apache2/sites-enabled