From 67221f47d290655b3d587606287489537a132e5c Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Fri, 13 Dec 2019 08:35:25 +0100
Subject: T1873: DHCP: ship our own server init scripts

---
 src/conf_mode/dhcpv6_server.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/conf_mode/dhcpv6_server.py')

diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index 039321430..44a927789 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2019 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
@@ -29,6 +29,7 @@ from vyos import ConfigError
 
 config_file = r'/etc/dhcp/dhcpdv6.conf'
 lease_file = r'/config/dhcpdv6.leases'
+pid_file = r'/var/run/dhcpdv6.pid'
 daemon_config_file = r'/etc/default/isc-dhcpv6-server'
 
 # Please be careful if you edit the template.
@@ -115,12 +116,12 @@ shared-network {{ network.name }} {
 """
 
 daemon_tmpl = """
-### Autogenerated by dhcp_server.py ###
+### Autogenerated by dhcpv6_server.py ###
 
 # sourced by /etc/init.d/isc-dhcpv6-server
 
-DHCPD_CONF=/etc/dhcp/dhcpdv6.conf
-DHCPD_PID=/var/run/dhcpdv6.pid
+DHCPD_CONF={{ config_file }}
+DHCPD_PID={{ pid_file }}
 OPTIONS="-6 -lf {{ lease_file }}"
 INTERFACES=""
 """
-- 
cgit v1.2.3