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

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

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 6017 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  a344d3c902417a21b619c6e4f2a1aaf38e3044fe (commit)
      from  e53c38aea14132da0fff15655735f673aab33c4a (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 a344d3c902417a21b619c6e4f2a1aaf38e3044fe
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 4 08:52:56 2020 +0100

    unbound/red.up: run unbound update-forwarders after suricata init.
    
    The old suricata instance blocks dns requests if the red ip has changed.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/aarch64/initscripts                         | 2 +-
 config/rootfiles/common/armv5tel/initscripts                        | 2 +-
 config/rootfiles/common/i586/initscripts                            | 2 +-
 config/rootfiles/common/x86_64/initscripts                          | 2 +-
 config/rootfiles/core/142/update.sh                                 | 6 +++---
 .../red.up/{22-update-dns-forwarders => 25-update-dns-forwarders}   | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/initscripts/networking/red.up/{22-update-dns-forwarders => 25-update-dns-forwarders} (100%)

Difference in files:
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 3c8dfc70a..4f7465791 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -54,9 +54,9 @@ etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
 etc/rc.d/init.d/networking/red.up/10-static-routes
 etc/rc.d/init.d/networking/red.up/20-firewall
-etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/networking/red.up/24-RS-qos
+etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/27-RS-squid
 etc/rc.d/init.d/networking/red.up/30-ddns
 #etc/rc.d/init.d/networking/red.up/35-guardian
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 3c8dfc70a..4f7465791 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -54,9 +54,9 @@ etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
 etc/rc.d/init.d/networking/red.up/10-static-routes
 etc/rc.d/init.d/networking/red.up/20-firewall
-etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/networking/red.up/24-RS-qos
+etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/27-RS-squid
 etc/rc.d/init.d/networking/red.up/30-ddns
 #etc/rc.d/init.d/networking/red.up/35-guardian
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 3f56c49cc..9db445a69 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -54,9 +54,9 @@ etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
 etc/rc.d/init.d/networking/red.up/10-static-routes
 etc/rc.d/init.d/networking/red.up/20-firewall
-etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/networking/red.up/24-RS-qos
+etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/27-RS-squid
 etc/rc.d/init.d/networking/red.up/30-ddns
 #etc/rc.d/init.d/networking/red.up/35-guardian
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 3f56c49cc..9db445a69 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -54,9 +54,9 @@ etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
 etc/rc.d/init.d/networking/red.up/10-static-routes
 etc/rc.d/init.d/networking/red.up/20-firewall
-etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/networking/red.up/24-RS-qos
+etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/27-RS-squid
 etc/rc.d/init.d/networking/red.up/30-ddns
 #etc/rc.d/init.d/networking/red.up/35-guardian
diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh
index dd1377c1c..686e9ae89 100644
--- a/config/rootfiles/core/142/update.sh
+++ b/config/rootfiles/core/142/update.sh
@@ -97,9 +97,9 @@ rm -f /etc/rc.d/init.d/networking/red.down/05-*-dns-forwarders
 # Extract files
 extract_files
 
-# move update forwarders below firewall
-mv -f /etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders \
-      /etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders
+# move update forwarders below suricata
+mv -f /etc/rc.d/init.d/networking/red.up/*-update-dns-forwarders \
+      /etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders
 
 # update linker config
 ldconfig
diff --git a/src/initscripts/networking/red.up/22-update-dns-forwarders b/src/initscripts/networking/red.up/25-update-dns-forwarders
similarity index 100%
rename from src/initscripts/networking/red.up/22-update-dns-forwarders
rename to src/initscripts/networking/red.up/25-update-dns-forwarders


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