1 files changed, 18 insertions, 19 deletions
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
index ccabc901d..9355d9794 100755
--- a/src/conf_mode/dhcpv6_relay.py
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2020 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -13,26 +13,20 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
 
-import sys
 import os
-import jinja2
+
+from sys import exit
+from copy import deepcopy
+from jinja2 import FileSystemLoader, Environment
 
 from vyos.config import Config
+from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
+from vyos.util import call
 
-config_file = r'/etc/default/isc-dhcpv6-relay'
-
-# Please be careful if you edit the template.
-config_tmpl = """
-### Autogenerated by dhcpv6_relay.py ###
-
-# Defaults for isc-dhcpv6-relay initscript sourced by /etc/init.d/isc-dhcpv6-relay
-OPTIONS="-6 -l {{ listen_addr | join(' -l ') }} -u {{ upstream_addr | join(' -u ') }} {{ options | join(' ') }}"
 
-"""
+config_file = r'/etc/default/isc-dhcpv6-relay'
 
 default_config_data = {
     'listen_addr': [],
@@ -41,7 +35,7 @@ default_config_data = {
 }
 
 def get_config():
-    relay = default_config_data
+    relay = deepcopy(default_config_data)
     conf = Config()
     if not conf.exists('service dhcpv6-relay'):
         return None
@@ -92,7 +86,12 @@ def generate(relay):
     if relay is None:
         return None
 
-    tmpl = jinja2.Template(config_tmpl)
+    # Prepare Jinja2 template loader from files
+    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dhcpv6-relay')
+    fs_loader = FileSystemLoader(tmpl_path)
+    env = Environment(loader=fs_loader)
+
+    tmpl = env.get_template('config.tmpl')
     config_text = tmpl.render(relay)
     with open(config_file, 'w') as f:
         f.write(config_text)
@@ -101,10 +100,10 @@ def generate(relay):
 
 def apply(relay):
     if relay is not None:
-        os.system('sudo systemctl restart isc-dhcpv6-relay.service')
+        call('sudo systemctl restart isc-dhcpv6-relay.service')
     else:
         # DHCPv6 relay support is removed in the commit
-        os.system('sudo systemctl stop isc-dhcpv6-relay.service')
+        call('sudo systemctl stop isc-dhcpv6-relay.service')
         os.unlink(config_file)
 
     return None
@@ -117,4 +116,4 @@ if __name__ == '__main__':
         apply(c)
     except ConfigError as e:
         print(e)
-        sys.exit(1)
+        exit(1)