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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2101 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  0d7ca700bd2c8eafbedf2261038496d4588bd5b7 (commit)
      from  e22bcd38d6857cd1ee7292cbf634db80d0dd813c (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 0d7ca700bd2c8eafbedf2261038496d4588bd5b7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 7 11:27:33 2016 +0200

    unbound: skip green interface if ip was set to 1.1.1.1
    
    this is a reserved marker for unused green ip.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 src/initscripts/init.d/unbound | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index d324457..3b8beee 100644
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -112,7 +112,7 @@ update_forwarders() {
 
 own_hostname() {
 	local hostname=$(hostname -f)
-	# 1.1.1.1 is reserved for green only, skip this
+	# 1.1.1.1 is reserved for unused green, skip this
 	if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then
 		unbound-control -q local_data "${hostname} ${LOCAL_TTL} IN A ${GREEN_ADDRESS}"
 	fi
@@ -148,7 +148,8 @@ write_interfaces_conf() {
 	(
 		config_header
 
-		if [ -n "${GREEN_ADDRESS}" ]; then
+		# 1.1.1.1 is reserved for unused green
+		if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then
 			echo "# GREEN"
 			echo "interface: ${GREEN_ADDRESS}"
 			echo "access-control: $(cidr ${GREEN_NETADDRESS} ${GREEN_NETMASK}) allow"


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