1 files changed, 10 insertions, 36 deletions

diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py
index b9163f7b3..038f77cf9 100755
--- a/src/conf_mode/dynamic_dns.py
+++ b/src/conf_mode/dynamic_dns.py
@@ -18,18 +18,14 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from stat import S_IRUSR, S_IWUSR
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
-from vyos.util import run
+from vyos.util import call
+from vyos.template import render
 
-
-config_file = r'/etc/ddclient/ddclient.conf'
-cache_file = r'/var/cache/ddclient/ddclient.cache'
-pid_file = r'/var/run/ddclient/ddclient.pid'
+config_file = r'/run/ddclient/ddclient.conf'
 
 # Mapping of service name to service protocol
 default_service_protocol = {
@@ -48,9 +44,7 @@ default_service_protocol = {
 
 default_config_data = {
     'interfaces': [],
-    'cache_file': cache_file,
-    'deleted': False,
-    'pid_file': pid_file
+    'deleted': False
 }
 
 def get_config():
@@ -221,28 +215,13 @@ def verify(dyndns):
 def generate(dyndns):
     # bail out early - looks like removal from running config
     if dyndns['deleted']:
-        if os.path.exists(config_file):
-            os.unlink(config_file)
-
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dynamic-dns')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    dirname = os.path.dirname(dyndns['pid_file'])
-    if not os.path.exists(dirname):
-        os.mkdir(dirname)
-
     dirname = os.path.dirname(config_file)
     if not os.path.exists(dirname):
         os.mkdir(dirname)
 
-    tmpl = env.get_template('ddclient.conf.tmpl')
-    config_text = tmpl.render(dyndns)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
+    render(config_file, 'dynamic-dns/ddclient.conf.tmpl', dyndns)
 
     # Config file must be accessible only by its owner
     os.chmod(config_file, S_IRUSR | S_IWUSR)
@@ -250,18 +229,13 @@ def generate(dyndns):
     return None
 
 def apply(dyndns):
-    if os.path.exists(dyndns['cache_file']):
-        os.unlink(dyndns['cache_file'])
-
-    if os.path.exists('/etc/ddclient.conf'):
-        os.unlink('/etc/ddclient.conf')
-
     if dyndns['deleted']:
-        run('/etc/init.d/ddclient stop')
-        if os.path.exists(dyndns['pid_file']):
-            os.unlink(dyndns['pid_file'])
+        call('systemctl stop ddclient.service')
+        if os.path.exists(config_file):
+            os.unlink(config_file)
+
     else:
-        run('/etc/init.d/ddclient restart')
+        call('systemctl restart ddclient.service')
 
     return None