mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
hamnur 2017-06-30 10:41:18 +02:00
commit ab95d1fa87
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/etc/inc/services.inc
View File

@ -2235,12 +2235,24 @@ function services_unbound_configure($restart_dhcp = true) {
echo "services_unbound_configure() being called $mt\n";
}
// kill any running Unbound instance
if (file_exists("{$g['varrun_path']}/unbound.pid")) {
sigkillbypid("{$g['varrun_path']}/unbound.pid", "TERM");
}
if (isset($config['unbound']['enable'])) {
require_once('/etc/inc/unbound.inc');
/* Attempt to stop unbound nicely */
do_as_unbound_user("stop");
/* kill Unbound if it did not stop cleanly */
if (file_exists("{$g['varrun_path']}/unbound.pid")) {
sigkillbypid("{$g['varrun_path']}/unbound.pid", "TERM");
}
/* If unbound is still running, wait up to 30 seconds for it to terminate. */
for ($i=1; $i <= 30; $i++) {
if (is_process_running('unbound')) {
sleep(1);
}
}
if (platform_booting()) {
echo gettext("Starting DNS Resolver...");
} else {
@ -2252,13 +2264,17 @@ function services_unbound_configure($restart_dhcp = true) {
$return = 1;
}
require_once('/etc/inc/unbound.inc');
sync_unbound_service();
if (platform_booting()) {
echo gettext("done.") . "\n";
}
system_dhcpleases_configure();
} else {
/* kill Unbound since it should not be enabled */
if (file_exists("{$g['varrun_path']}/unbound.pid")) {
sigkillbypid("{$g['varrun_path']}/unbound.pid", "TERM");
}
}
if (!platform_booting() && $restart_dhcp) {

4
src/etc/inc/unbound.inc
View File

@ -465,10 +465,10 @@ function do_as_unbound_user($cmd, $param1 = "") {
mwexec("/usr/local/sbin/unbound -c {$g['unbound_chroot_path']}/unbound.conf");
break;
case "stop":
mwexec("echo '/usr/local/sbin/unbound-control stop' | /usr/bin/su -m unbound", true);
mwexec("echo '/usr/local/sbin/unbound-control -c {$g['unbound_chroot_path']}/unbound.conf stop' | /usr/bin/su -m unbound", true);
break;
case "reload":
mwexec("echo '/usr/local/sbin/unbound-control reload' | /usr/bin/su -m unbound", true);
mwexec("echo '/usr/local/sbin/unbound-control -c {$g['unbound_chroot_path']}/unbound.conf reload' | /usr/bin/su -m unbound", true);
break;
case "unbound-anchor":
$root_key_file = "{$g['unbound_chroot_path']}{$param1}/root.key";