1 files changed, 15 insertions, 41 deletions

diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index 69aebe2f4..da01f16eb 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -17,25 +17,19 @@
 import os
 
 from ipaddress import ip_address, ip_network
-from jinja2 import FileSystemLoader, Environment
 from socket import inet_ntoa
 from struct import pack
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos.validate import is_subnet_connected
 from vyos import ConfigError
-from vyos.util import run
+from vyos.template import render
+from vyos.util import call, chown
 
-
-config_file = r'/etc/dhcp/dhcpd.conf'
-lease_file = r'/config/dhcpd.leases'
-pid_file = r'/var/run/dhcpd.pid'
-daemon_config_file = r'/etc/default/isc-dhcpv4-server'
+config_file = r'/run/dhcp-server/dhcpd.conf'
 
 default_config_data = {
-    'lease_file': lease_file,
     'disabled': False,
     'ddns_enable': False,
     'global_parameters': [],
@@ -451,7 +445,7 @@ def get_config():
     return dhcp
 
 def verify(dhcp):
-    if (dhcp is None) or (dhcp['disabled'] is True):
+    if not dhcp or dhcp['disabled']:
         return None
 
     # If DHCP is enabled we need one share-network
@@ -597,49 +591,29 @@ def verify(dhcp):
     return None
 
 def generate(dhcp):
-    if dhcp is None:
-        return None
-
-    if dhcp['disabled'] is True:
-        print('Warning: DHCP server will be deactivated because it is disabled')
+    if not dhcp or dhcp['disabled']:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcp-server')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
+    # Create configuration directory on demand
+    dirname = os.path.dirname(config_file)
+    if not os.path.isdir(dirname):
+        os.mkdir(dirname)
 
-    tmpl = env.get_template('dhcpd.conf.tmpl')
-    config_text = tmpl.render(dhcp)
     # Please see: https://phabricator.vyos.net/T1129 for quoting of the raw parameters
     # we can pass to ISC DHCPd
-    config_text = config_text.replace(""",'"')
-
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
-    tmpl = env.get_template('daemon.tmpl')
-    config_text = tmpl.render(dhcp)
-    with open(daemon_config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dhcp-server/dhcpd.conf.tmpl', dhcp,
+           formater=lambda _: _.replace(""", '"'))
     return None
 
 def apply(dhcp):
-    if (dhcp is None) or dhcp['disabled']:
+    if not dhcp or dhcp['disabled']:
         # DHCP server is removed in the commit
-        run('sudo systemctl stop isc-dhcpv4-server.service')
+        call('systemctl stop isc-dhcp-server.service')
         if os.path.exists(config_file):
             os.unlink(config_file)
-        if os.path.exists(daemon_config_file):
-            os.unlink(daemon_config_file)
-    else:
-        # If our file holding DHCP leases does yet not exist - create it
-        if not os.path.exists(lease_file):
-            os.mknod(lease_file)
-
-        run('sudo systemctl restart isc-dhcpv4-server.service')
+        return None
 
+    call('systemctl restart isc-dhcp-server.service')
     return None
 
 if __name__ == '__main__':