Merge pull request #381 from thomas-mangin/T2388

template: T2388: move mkdir/chmod/chown within render()

14 files changed, 18 insertions, 87 deletions

diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index ce0e01308..d24a46220 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -98,11 +98,6 @@ def generate(relay):
     if not relay:
         return None
 
-    # Create configuration directory on demand
-    dirname = os.path.dirname(config_file)
-    if not os.path.isdir(dirname):
-        os.mkdir(dirname)
-
     render(config_file, 'dhcp-relay/config.tmpl', relay)
     return None
 
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index da01f16eb..1849ece0a 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -594,11 +594,6 @@ def generate(dhcp):
     if not dhcp or dhcp['disabled']:
         return None
 
-    # Create configuration directory on demand
-    dirname = os.path.dirname(config_file)
-    if not os.path.isdir(dirname):
-        os.mkdir(dirname)
-
     # Please see: https://phabricator.vyos.net/T1129 for quoting of the raw parameters
     # we can pass to ISC DHCPd
     render(config_file, 'dhcp-server/dhcpd.conf.tmpl', dhcp,
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index cb5a4bbfb..ecc739063 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -84,11 +84,6 @@ def generate(relay):
     if relay is None:
         return None
 
-    # Create configuration directory on demand
-    dirname = os.path.dirname(config_file)
-    if not os.path.isdir(dirname):
-        os.mkdir(dirname)
-
     render(config_file, 'dhcpv6-relay/config.tmpl', relay)
     return None
 
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index ce98e39c3..07e936906 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -335,11 +335,6 @@ def generate(dhcpv6):
     if not dhcpv6 or dhcpv6['disabled']:
         return None
 
-    # Create configuration directory on demand
-    dirname = os.path.dirname(config_file)
-    if not os.path.isdir(dirname):
-        os.mkdir(dirname)
-
     render(config_file, 'dhcpv6-server/dhcpdv6.conf.tmpl', dhcpv6)
     return None
 
diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index 567dfa4b3..7f7417b00 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -152,10 +152,6 @@ def generate(dns):
     if dns is None:
         return None
 
-    dirname = os.path.dirname(config_file)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     render(config_file, 'dns-forwarding/recursor.conf.tmpl', dns, trim_blocks=True)
     return None
 
diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py
index 038f77cf9..3386324ae 100755
--- a/src/conf_mode/dynamic_dns.py
+++ b/src/conf_mode/dynamic_dns.py
@@ -217,10 +217,6 @@ def generate(dyndns):
     if dyndns['deleted']:
         return None
 
-    dirname = os.path.dirname(config_file)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     render(config_file, 'dynamic-dns/ddclient.conf.tmpl', dyndns)
 
     # Config file must be accessible only by its owner
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index f942b7d2f..dbc40d8d4 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -173,12 +173,6 @@ def generate(pppoe):
     config_files = [config_pppoe, script_pppoe_pre_up, script_pppoe_ip_up,
                     script_pppoe_ip_down, script_pppoe_ipv6_up]
 
-    # Ensure directories for config files exist - otherwise create them on demand
-    for file in config_files:
-        dirname = os.path.dirname(file)
-        if not os.path.isdir(dirname):
-            os.mkdir(dirname)
-
     # Always hang-up PPPoE connection prior generating new configuration file
     cmd(f'systemctl stop ppp@{intf}.service')
 
@@ -189,27 +183,23 @@ def generate(pppoe):
                 os.unlink(file)
 
     else:
+        # generated script must be executable
+
         # Create PPP configuration files
         render(config_pppoe, 'pppoe/peer.tmpl',
-               pppoe, trim_blocks=True)
+               pppoe, trim_blocks=True, permision=0o755)
         # Create script for ip-pre-up.d
         render(script_pppoe_pre_up, 'pppoe/ip-pre-up.script.tmpl',
-               pppoe, trim_blocks=True)
+               pppoe, trim_blocks=True, permision=0o755)
         # Create script for ip-up.d
         render(script_pppoe_ip_up, 'pppoe/ip-up.script.tmpl',
-               pppoe, trim_blocks=True)
+               pppoe, trim_blocks=True, permision=0o755)
         # Create script for ip-down.d
         render(script_pppoe_ip_down, 'pppoe/ip-down.script.tmpl',
-               pppoe, trim_blocks=True)
+               pppoe, trim_blocks=True, permision=0o755)
         # Create script for ipv6-up.d
         render(script_pppoe_ipv6_up, 'pppoe/ipv6-up.script.tmpl',
-               pppoe, trim_blocks=True)
-
-        # make generated script file executable
-        chmod_755(script_pppoe_pre_up)
-        chmod_755(script_pppoe_ip_up)
-        chmod_755(script_pppoe_ip_down)
-        chmod_755(script_pppoe_ipv6_up)
+               pppoe, trim_blocks=True, permision=0o755)
 
     return None
 
diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index 163778e22..a3a2a2648 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -152,12 +152,6 @@ def generate(wwan):
     config_files = [config_wwan, config_wwan_chat, script_wwan_pre_up,
                     script_wwan_ip_up, script_wwan_ip_down]
 
-    # Ensure directories for config files exist - otherwise create them on demand
-    for file in config_files:
-        dirname = os.path.dirname(file)
-        if not os.path.isdir(dirname):
-            os.mkdir(dirname)
-
     # Always hang-up WWAN connection prior generating new configuration file
     cmd(f'systemctl stop ppp@{intf}.service')
 
@@ -172,17 +166,18 @@ def generate(wwan):
         render(config_wwan, 'wwan/peer.tmpl', wwan)
         # Create PPP chat script
         render(config_wwan_chat, 'wwan/chat.tmpl', wwan)
+
+        # generated script file must be executable
+
         # Create script for ip-pre-up.d
-        render(script_wwan_pre_up, 'wwan/ip-pre-up.script.tmpl', wwan)
+        render(script_wwan_pre_up, 'wwan/ip-pre-up.script.tmpl',
+               wwan, permission=0o755)
         # Create script for ip-up.d
-        render(script_wwan_ip_up, 'wwan/ip-up.script.tmpl', wwan)
+        render(script_wwan_ip_up, 'wwan/ip-up.script.tmpl',
+               wwan, permission=0o755)
         # Create script for ip-down.d
-        render(script_wwan_ip_down, 'wwan/ip-down.script.tmpl', wwan)
-
-        # make generated script file executable
-        chmod_755(script_wwan_pre_up)
-        chmod_755(script_wwan_ip_up)
-        chmod_755(script_wwan_ip_down)
+        render(script_wwan_ip_down, 'wwan/ip-down.script.tmpl',
+               wwan, permission=0o755)
 
     return None
 
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index dffe7fcd4..8bc35bb45 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -79,14 +79,8 @@ def generate(salt):
     if not salt:
         return None
 
-    for file in [config_file, master_keyfile]:
-        dirname = os.path.dirname(file)
-        if not os.path.exists(dirname):
-            os.mkdir(dirname)
-            chown(dirname, salt['user'], salt['group'])
-
-    render(config_file, 'salt-minion/minion.tmpl', salt)
-    chown(config_file, salt['user'], salt['group'])
+    render(config_file, 'salt-minion/minion.tmpl', salt,
+           user=salt['user'], group=salt['group'])
 
     if not os.path.exists(master_keyfile):
         if salt['master_key']:
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py
index 17fa2c3f0..b53692d37 100755
--- a/src/conf_mode/service_ipoe-server.py
+++ b/src/conf_mode/service_ipoe-server.py
@@ -265,10 +265,6 @@ def generate(ipoe):
     if not ipoe:
         return None
 
-    dirname = os.path.dirname(ipoe_conf)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     render(ipoe_conf, 'accel-ppp/ipoe.config.tmpl', ipoe, trim_blocks=True)
 
     if ipoe['auth_mode'] == 'local':
diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index 64890c992..36033b198 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -429,10 +429,6 @@ def generate(pppoe):
     if not pppoe:
         return None
 
-    dirname = os.path.dirname(pppoe_conf)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     render(pppoe_conf, 'accel-ppp/pppoe.config.tmpl', pppoe, trim_blocks=True)
 
     if pppoe['local_users']:
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index a4ef99d45..f312f2a17 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -340,10 +340,6 @@ def generate(l2tp):
     if not l2tp:
         return None
 
-    dirname = os.path.dirname(l2tp_conf)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     render(l2tp_conf, 'accel-ppp/l2tp.config.tmpl', l2tp, trim_blocks=True)
 
     if l2tp['auth_mode'] == 'local':
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py
index 046fc8f9c..085c9c2c6 100755
--- a/src/conf_mode/vpn_pptp.py
+++ b/src/conf_mode/vpn_pptp.py
@@ -247,10 +247,6 @@ def generate(pptp):
     if not pptp:
         return None
 
-    dirname = os.path.dirname(pptp_conf)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     render(pptp_conf, 'accel-ppp/pptp.config.tmpl', pptp, trim_blocks=True)
 
     if pptp['local_users']:
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index e6ce94709..d250cd3b0 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -303,10 +303,6 @@ def generate(sstp):
     if not sstp:
         return None
 
-    dirname = os.path.dirname(sstp_conf)
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     # accel-cmd reload doesn't work so any change results in a restart of the daemon
     render(sstp_conf, 'accel-ppp/sstp.config.tmpl', sstp, trim_blocks=True)