From mboxrd@z Thu Jan 1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
b5afe1e8d55525462b27e6147182f2bd0623fc56
Date: Mon, 02 Mar 2020 22:26:29 +0000
Message-ID: <48WZVt1c89z2y4H@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5951386621574954107=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============5951386621574954107==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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 b5afe1e8d55525462b27e6147182f2bd0623fc56 (commit)
via 3b5131c1a3416c9c9aef1365d3787abea197d37d (commit)
from e1c6cd05e3a1f08b28f8d0eea4736c829f12b06f (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 b5afe1e8d55525462b27e6147182f2bd0623fc56
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 2 22:25:41 2020 +0000
backup: add /var/ipfire/dns/server to include
=20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3b5131c1a3416c9c9aef1365d3787abea197d37d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 2 17:54:48 2020 +0000
unbound: drop remove-dns-fowarders at red.down
=20
this functions has only reloaded unbound config
which is useless at shutting down the red interface.
=20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/include | 1 +
config/rootfiles/common/aarch64/initscripts | 1 -
config/rootfiles/common/armv5tel/initscripts | 1 -
config/rootfiles/common/i586/initscripts | 1 -
config/rootfiles/common/x86_64/initscripts | 1 -
config/rootfiles/core/142/filelists/files | 1 +
config/rootfiles/core/142/update.sh | 3 +++
.../networking/red.down/05-remove-dns-forwarders | 4 ----
src/initscripts/system/unbound | 14 ++----------=
--
9 files changed, 7 insertions(+), 20 deletions(-)
delete mode 100644 src/initscripts/networking/red.down/05-remove-dns-forward=
ers
Difference in files:
diff --git a/config/backup/include b/config/backup/include
index 1190eda81..d33dcf099 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -31,6 +31,7 @@
/var/ipfire/*/*.conf
/var/ipfire/*/config
/var/ipfire/dhcp/*
+/var/ipfire/dns/server
/var/ipfire/dnsforward/*
/var/ipfire/*/enable
/var/ipfire/*/*enable*
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/c=
ommon/aarch64/initscripts
index 34ea1433f..3c8dfc70a 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
#etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/=
common/armv5tel/initscripts
index 34ea1433f..3c8dfc70a 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
#etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/comm=
on/i586/initscripts
index 9350b0e90..3f56c49cc 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
#etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/co=
mmon/x86_64/initscripts
index 9350b0e90..3f56c49cc 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -42,7 +42,6 @@ etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
#etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/cor=
e/142/filelists/files
index 8be29a77c..0ac4861cd 100644
--- a/config/rootfiles/core/142/filelists/files
+++ b/config/rootfiles/core/142/filelists/files
@@ -13,4 +13,5 @@ srv/web/ipfire/cgi-bin/dns.cgi
srv/web/ipfire/cgi-bin/fireinfo.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
+var/ipfire/backup/include
var/ipfire/suricata/ruleset-sources
diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/=
update.sh
index bf63f58ca..9a5829152 100644
--- a/config/rootfiles/core/142/update.sh
+++ b/config/rootfiles/core/142/update.sh
@@ -91,6 +91,9 @@ rm -rf /usr/lib/pppd/2.4.7
/etc/init.d/squid stop
/etc/init.d/suricata stop
=20
+# drop unbound remove-forwarders
+rm -f /etc/rc.d/init.d/netowrking/red.down/05-remove-dns-forwarders
+
# Extract files
extract_files
=20
diff --git a/src/initscripts/networking/red.down/05-remove-dns-forwarders b/s=
rc/initscripts/networking/red.down/05-remove-dns-forwarders
deleted file mode 100644
index 671cca9df..000000000
--- a/src/initscripts/networking/red.down/05-remove-dns-forwarders
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Remove DNS forwarders for unbound
-exec /etc/init.d/unbound remove-forwarders
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 0aab6cc8c..c845c436f 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -274,8 +274,6 @@ get_memory_amount() {
}
=20
fix_time_if_dns_fails() {
- # Sometimes the first try fails so do it twice
- resolve "ping.ipfire.org" &>/dev/null
# If DNS is working, everything is fine
if resolve "ping.ipfire.org" &>/dev/null; then
return 0
@@ -587,7 +585,7 @@ case "$1" in
sleep 1
$0 start
;;
- reload|remove-forwarders|update-forwarders)
+ reload|update-forwarders)
# Update configuration files
write_forward_conf
write_hosts_conf
@@ -595,10 +593,6 @@ case "$1" in
# Call unbound-control and perform the reload
/usr/sbin/unbound-control -q reload
=20
- if [ "$1" =3D "remove-forwarders" ]; then
- exit 0
- fi
-
# Dummy Resolve to wait for unbound
resolve "ping.ipfire.org" &>/dev/null
=20
@@ -617,16 +611,12 @@ case "$1" in
statusproc /usr/sbin/unbound
;;
=20
- # Make sure DNS works at this point
- fix_time_if_dns_fails
- ;;
-
resolve)
resolve "${2}" || exit $?
;;
=20
*)
- echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarder=
s|remove-forwarders}"
+ echo "Usage: $0 {start|stop|restart|reload|status|resolve|update-forwarder=
s}"
exit 1
;;
esac
hooks/post-receive
--
IPFire 2.x development tree
--===============5951386621574954107==--