Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/backup/include b/config/backup/include
index eb76ebf3621cff07755d1d03c67bbfb962853d19..e1edeff6af10dc12f7927c194d4ea09014d1c321 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -5,6 +5,7 @@
 /var/ipfire/*/enable
 /var/ipfire/*/*enable*
 /var/ipfire/ovpn/collectd.vpn
+/etc/unbound
 /etc/passwd
 /etc/shadow
 /etc/group

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 3b5af0114d74ba1834fceae5cf78cbe2d3d8c0cb..258ad85a14e92a73c62909ef5033ac10218715cc 100644 (file)
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -23,3 +23,4 @@ srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 usr/sbin/setup
+var/ipfire/backup/include

diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index 3b8beee24826526de78aa81f44bed3151aaa673a..136084458f3ea8a8ab709d4839fff6485d316b47 100644 (file)
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -148,16 +148,17 @@ 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 "# GREEN"
-                       echo "interface: ${GREEN_ADDRESS}"
+                       echo "# allow access from GREEN"
                        echo "access-control: $(cidr ${GREEN_NETADDRESS} ${GREEN_NETMASK}) allow"
                fi
 
                if [ -n "${BLUE_ADDRESS}" ]; then
-                       echo "# BLUE"
-                       echo "interface: ${BLUE_ADDRESS}"
+                       echo "# allow access from  BLUE"
                        echo "access-control: $(cidr ${BLUE_NETADDRESS} ${BLUE_NETMASK}) allow"
                fi
        ) > /etc/unbound/interfaces.conf

diff --git a/src/setup/networking.c b/src/setup/networking.c
index b840ec127a119ea9ac885a71a6979af5f59111d4..00dfc4b5a7d3a8aa02344d2966a60db6f7776007 100644 (file)
--- a/src/setup/networking.c
+++ b/src/setup/networking.c
@@ -113,6 +113,8 @@ int handlenetworking(void)
 
                        runcommandwithstatus("/etc/rc.d/init.d/network start",
                                _("Networking"), _("Restarting network..."), NULL);
+                       runcommandwithstatus("/etc/rc.d/init.d/unbound restart",
+                               _("Networking"), _("Restarting unbound..."), NULL);
                }
        } else {
                rename_nics();