From 8a0aa42c197361ebb82387e5bdc8378e5440837f Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 29 Jun 2017 12:21:10 -0400
Subject: unbound-control needs to know the config path or else it can't work
 properly. Fixes #7667

---
 src/etc/inc/unbound.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/etc')

diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc
index 428a523..e8adc89 100644
--- a/src/etc/inc/unbound.inc
+++ b/src/etc/inc/unbound.inc
@@ -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";
-- 
cgit v1.1


From 38d110824c87ff60c6289c0432d55009586ceee4 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 29 Jun 2017 12:32:45 -0400
Subject: Change the way unbound is stopped when the process is being
 restarted, to give the old process enough time to exit cleanly. Fixes #7326

---
 src/etc/inc/services.inc | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'src/etc')

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index ffc4aa8..104a054 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -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) {
-- 
cgit v1.1