diff options
| author | Chris Buechler <cmb@pfsense.org> | 2014-11-22 15:34:34 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2014-11-22 15:34:34 -0600 |
| commit | 1ea3b03b5c40f902c35d82a13e6908cbfb4b417c (patch) | |
| tree | 7778447050f8d15757efa7bd2d9fcf582929ae3f | |
| parent | e840fc8cd09643c277259a8b4e07612eef06373f (diff) | |
| parent | 38e91976732ef42002adf22c997ea29a88d5cb1d (diff) | |
| download | pfsense-1ea3b03b5c40f902c35d82a13e6908cbfb4b417c.zip pfsense-1ea3b03b5c40f902c35d82a13e6908cbfb4b417c.tar.gz | |
Merge branch 'wagonza'
| -rw-r--r-- | etc/inc/services.inc | 4 | ||||
| -rw-r--r-- | etc/inc/system.inc | 2 | ||||
| -rw-r--r-- | etc/inc/unbound.inc | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index a7fdeb4..b8a99ae 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1864,6 +1864,8 @@ function services_dnsmasq_configure() { mwexec_bg($cmd); unset($args); + system_dhcpleases_configure(); + if ($g['booting']) echo gettext("done.") . "\n"; } @@ -1903,6 +1905,8 @@ function services_unbound_configure() { sync_unbound_service(); if ($g['booting']) echo gettext("done.") . "\n"; + + system_dhcpleases_configure(); } if (!$g['booting']) { diff --git a/etc/inc/system.inc b/etc/inc/system.inc index babfb46..fd927bd 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -381,8 +381,6 @@ function system_hosts_generate() { unbound_hosts_generate(); } - system_dhcpleases_configure(); - return 0; } diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc index eb62744..c7b0ce7 100644 --- a/etc/inc/unbound.inc +++ b/etc/inc/unbound.inc @@ -427,6 +427,9 @@ function do_as_unbound_user($cmd) { case "stop": mwexec("echo '/usr/local/sbin/unbound-control stop' | /usr/bin/su -m unbound", true); break; + case "reload": + mwexec("echo '/usr/local/sbin/unbound-control reload' | /usr/bin/su -m unbound", true); + break; case "unbound-anchor": mwexec("echo '/usr/local/sbin/unbound-anchor -a {$g['unbound_chroot_path']}/root.key' | /usr/bin/su -m unbound", true); break; |
