[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d57f8d886f382d8aa8bd28cbf993c42ff742a03d

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4538 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  d57f8d886f382d8aa8bd28cbf993c42ff742a03d (commit)
       via  a51ce2defaee61912bb810449d5932fc2b95ae8a (commit)
       via  391e3390efc1be31a8be976d0235980f3e13101a (commit)
       via  68fac98a5b3bf78c8e4b11c7febe68c3cbc0776d (commit)
      from  0c55ec5a49770d5972c62c99499fbd6eef88ded3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d57f8d886f382d8aa8bd28cbf993c42ff742a03d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Aug 30 19:03:25 2017 +0200

    strongswan: rootfile update
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit a51ce2defaee61912bb810449d5932fc2b95ae8a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Aug 30 19:02:08 2017 +0200

    core114: add unbound initskript to updater.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 391e3390efc1be31a8be976d0235980f3e13101a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Aug 30 10:35:32 2017 +0200

    unbound: flush negative and bogus at update forwarders
    
    this resolves problems that negative answers from
    a forwarder was still used after setting new servers.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 68fac98a5b3bf78c8e4b11c7febe68c3cbc0776d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Aug 30 10:32:44 2017 +0200

    unbound: run time fix also after update forwarder
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/strongswan        |  1 +
 config/rootfiles/core/114/filelists/files |  1 +
 src/initscripts/system/unbound            | 27 ++++++++++++++++++---------
 3 files changed, 20 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index fbc5786..21a6655 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -71,6 +71,7 @@ etc/strongswan.d/starter.conf
 etc/strongswan.d/swanctl.conf
 #etc/swanctl
 etc/swanctl/bliss
+etc/swanctl/conf.d
 etc/swanctl/ecdsa
 etc/swanctl/pkcs12
 etc/swanctl/pkcs8
diff --git a/config/rootfiles/core/114/filelists/files b/config/rootfiles/core/114/filelists/files
index 168c7d1..ca8087f 100644
--- a/config/rootfiles/core/114/filelists/files
+++ b/config/rootfiles/core/114/filelists/files
@@ -1,3 +1,4 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/unbound
 var/ipfire/langs
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 3002f48..e5554d7 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -454,6 +454,18 @@ disable_dnssec() {
 	unbound-control -q set_option val-permissive-mode: yes
 }
 
+fix_time_if_dns_fail() {
+	# If DNS still not work try to init ntp with
+	# hardcoded ntp.ipfire.org (81.3.27.46)
+	if [ -e /var/ipfire/red/active ]; then
+		host 0.ipfire.pool.ntp.org > /dev/null 2>&1
+		if [ "${?}" != "0" ]; then
+			boot_mesg "DNS still not work ... init time with ntp.ipfire.org at 81.3.27.46 ..."
+			loadproc /usr/local/bin/settime 81.3.27.46
+		fi
+	fi
+}
+
 case "$1" in
 	start)
 		# Print a nicer messagen when unbound is already running
@@ -485,15 +497,7 @@ case "$1" in
 		# Update hosts
 		update_hosts
 
-		# If DNS still not work try to init ntp with
-		# hardcoded ntp.ipfire.org (81.3.27.46)
-		if [ -e /var/ipfire/red/active ]; then
-			host 0.ipfire.pool.ntp.org > /dev/null 2>&1
-			if [ "${?}" != "0" ]; then
-				boot_mesg "DNS still not work ... init time with ntp.ipfire.org at 81.3.27.46 ..."
-				loadproc /usr/local/bin/settime 81.3.27.46
-			fi
-		fi
+		fix_time_if_dns_fail
 		;;
 
 	stop)
@@ -518,6 +522,11 @@ case "$1" in
 		fi
 
 		update_forwarders
+
+		unbound-control flush_negative > /dev/null
+		unbound-control flush_bogus > /dev/null
+
+		fix_time_if_dns_fail
 		;;
 
 	test-name-server)


hooks/post-receive
--
IPFire 2.x development tree