diff options
| -rwxr-xr-x | bootstrap/apply-baseupdate.sh | 1 | ||||
| -rwxr-xr-x | bootstrap/make-dhcpd.pl | 8 | ||||
| -rwxr-xr-x | bootstrap/make-dhcpd6.pl | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/bootstrap/apply-baseupdate.sh b/bootstrap/apply-baseupdate.sh index 055320c..d4c6fe2 100755 --- a/bootstrap/apply-baseupdate.sh +++ b/bootstrap/apply-baseupdate.sh @@ -10,5 +10,6 @@ then fi; ssh -l root ${PRIMARY} "/etc/init.d/isc-dhcp-server restart" +ssh -l root ${PRIMARY} "/etc/init.d/isc-dhcp6-server restart" ssh -l root ${PRIMARY} "/usr/sbin/rndc reload" ssh -l root ${SECONDARY} "/usr/sbin/rndc reload" diff --git a/bootstrap/make-dhcpd.pl b/bootstrap/make-dhcpd.pl index ea7bed6..317317d 100755 --- a/bootstrap/make-dhcpd.pl +++ b/bootstrap/make-dhcpd.pl @@ -135,14 +135,14 @@ if ( not -f $dhcpd_wlc_conf ) open WLCFILE, ">" . $dhcpd_wlc_conf or die ( $! . " " . $dhcpd_wlc_conf); print WLCFILE <<"EOF"; -option space AP; -option AP.server-address code 241 = array of ip-address; +option space WLC; +option WLC.controller-address code 43 = text; set vendor-string = option vendor-class-identifier; class "access-points" { match if substring (option vendor-class-identifier, 0, 8) = "Access Point"; - vendor-option-space AP; - option AP.server-address $nms::config::wlc1; + vendor-option-space WLC; + option WLC.controller-address "$nms::config::wlc1"; } EOF close WLCFILE; diff --git a/bootstrap/make-dhcpd6.pl b/bootstrap/make-dhcpd6.pl index 67583c9..51d93c4 100755 --- a/bootstrap/make-dhcpd6.pl +++ b/bootstrap/make-dhcpd6.pl @@ -35,33 +35,33 @@ if ( not -f $dhcpd_conf ) # IPv6 address valid lifetime # (at the end the address is no longer usable by the client) # (set to 30 days, the usual IPv6 default) -default-lease-time 2592000; +default-lease-time 3600; # IPv6 address preferred lifetime # (at the end the address is deprecated, i.e., the client should use # other addresses for new connections) # (set to 7 days, the usual IPv6 default) -preferred-lifetime 604800; +preferred-lifetime 3600; # T1, the delay before Renew # (default is 1/2 preferred lifetime) # (set to 1 hour) -option dhcp-renewal-time 3600; +option dhcp-renewal-time 1800; # T2, the delay before Rebind (if Renews failed) # (default is 3/4 preferred lifetime) # (set to 2 hours) -option dhcp-rebinding-time 7200; +option dhcp-rebinding-time 1800; # Enable RFC 5007 support allow leasequery; # Set preference to 255 (maximum) in order to avoid waiting for # additional servers when there is only one -option dhcp6.preference 255; +#option dhcp6.preference 255; # Server side command to enable rapid-commit (2 packet exchange) -option dhcp6.rapid-commit; +#option dhcp6.rapid-commit; # The delay before information-request refresh # (minimum is 10 minutes, maximum one day, default is to not refresh) |