unbound: Move "listen on all" to main configuration file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf
index 6d8a7f29c30e402d35ac3c17626f7abf02c9db2e..5193dd93123f9c0e2c6446ad32a7a052df07b474 100644 (file)
--- a/config/unbound/unbound.conf
+++ b/config/unbound/unbound.conf
@@ -61,11 +61,13 @@ server:
        harden-algo-downgrade: no
        use-caps-for-id: no
 
+       # Listen on all interfaces
+       interface: 0.0.0.0
+
        # Deny access from everywhere
        access-control: 0.0.0.0/0 refuse
 
-       # Listen on localhost
-       interface: 127.0.0.1
+       # Allow access from localhost
        access-control: 127.0.0.0/8 allow
 
        # Bootstrap root servers

diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index 136084458f3ea8a8ab709d4839fff6485d316b47..4c6b452225a1876c9b8c03cd7c516ce05a0a675a 100644 (file)
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -148,9 +148,6 @@ write_interfaces_conf() {
        (
                config_header
 
-               echo "# bound to all interfaces"
-               echo "interface: 0.0.0.0"
-
                # 1.1.1.1 is reserved for unused green
                if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then
                        echo "# allow access from GREEN"