diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-12-13 09:25:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-13 09:25:37 +0100 |
commit | d814020778b8310faa3cd57ccfbc718bfb2fe215 (patch) | |
tree | f27684afe97b6a1edb90484e1c014e996c8edd41 /src/conf_mode/dhcpv6_server.py | |
parent | 9dc0d74098f98d2917a85959acd4915fe7a4ffe1 (diff) | |
parent | 8a28567736dfaffd4b827f1b8b769814474d73ba (diff) | |
download | vyos-1x-d814020778b8310faa3cd57ccfbc718bfb2fe215.tar.gz vyos-1x-d814020778b8310faa3cd57ccfbc718bfb2fe215.zip |
Merge pull request #182 from jjakob/equuleus
Diffstat (limited to 'src/conf_mode/dhcpv6_server.py')
-rwxr-xr-x | src/conf_mode/dhcpv6_server.py | 9 |
1 files changed, 5 insertions, 4 deletions
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="" """ |