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 693928d781bee3151d5108a6f68a464202e78eeb (commit) via 0fa8a4e98e3c7b44f0e66f9958693a66bbb7fdeb (commit) via 11ecfb92a0b9b9020c646e66f15dd1a5b2720f7c (commit) via d221f41fbe38e32afc2fd0bab6ee80aa94b9f1a4 (commit) via 3a6752d9282ba78283f8a31564f359868662ff79 (commit) from d653b433ec6ffbc92a448766852fa4202586be9a (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 693928d781bee3151d5108a6f68a464202e78eeb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 12 23:01:51 2016 +0200
unbound: start prior network
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0fa8a4e98e3c7b44f0e66f9958693a66bbb7fdeb Merge: 11ecfb9 d653b43 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 12 22:52:34 2016 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 11ecfb92a0b9b9020c646e66f15dd1a5b2720f7c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 12 22:51:35 2016 +0200
backup: add unbound config
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d221f41fbe38e32afc2fd0bab6ee80aa94b9f1a4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 12 22:41:19 2016 +0200
unbound: bind to all interfaces
this allow to add interfaces without restart unbound.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3a6752d9282ba78283f8a31564f359868662ff79 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 12 22:39:41 2016 +0200
setup: restart unbound after network config change
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/include | 1 + config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/core/106/filelists/files | 3 ++- config/rootfiles/core/106/update.sh | 3 +++ lfs/initscripts | 2 +- src/initscripts/init.d/unbound | 9 +++++---- src/setup/networking.c | 2 ++ 9 files changed, 17 insertions(+), 9 deletions(-)
Difference in files: diff --git a/config/backup/include b/config/backup/include index eb76ebf..e1edeff 100644 --- 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/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 5cf7061..a807760 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -181,7 +181,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 352fac6..6ec7c63 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -185,7 +185,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 352fac6..6ec7c63 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -185,7 +185,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 3b5af01..fd363f3 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -10,7 +10,7 @@ etc/rc.d/init.d/ntp etc/rc.d/init.d/setclock etc/rc.d/init.d/unbound etc/rc.d/rc0.d/K79unbound -etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc3.d/S11unbound etc/rc.d/rc6.d/K79unbound srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi @@ -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/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh index 09d183e..c3609af 100644 --- a/config/rootfiles/core/106/update.sh +++ b/config/rootfiles/core/106/update.sh @@ -55,6 +55,9 @@ rm -vf \ /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \ /usr/sbin/dnsmasq
+# delete unbound link after network start +rm -vf /etc/rc.d/rc3.d/S21unbound + # Delete old net-traffic stuff rm -vrf \ /etc/rc.d/helper/writeipac.pl \ diff --git a/lfs/initscripts b/lfs/initscripts index 4369ffe..c5baf68 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -128,7 +128,7 @@ $(TARGET) : ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network ln -sf ../init.d/unbound /etc/rc.d/rc0.d/K79unbound - ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S21unbound + ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S11unbound ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K79unbound ln -sf ../init.d/random /etc/rc.d/rc0.d/K45random ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index 3b8beee..1360844 100644 --- 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 b840ec1..00dfc4b 100644 --- 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();
hooks/post-receive -- IPFire 2.x development tree