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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2582 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  2d0c7a9f7b8f830a5e2b193ffea4334409e25bf1 (commit)
      from  becbf67de73290f43fd6658c2c66c6e174d6afe2 (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 2d0c7a9f7b8f830a5e2b193ffea4334409e25bf1
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed Mar 11 14:26:55 2015 +0100

    BUG10620: move reload of firewall.local to main()

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

Summary of changes:
 config/firewall/rules.pl | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 97b8897..8abc675 100755
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -88,14 +88,27 @@ sub main {
 	# Flush all chains.
 	&flush();
 
-	# Reload firewall rules.
-	&preparerules();
+	# Prepare firewall rules.
+	if (! -z  "${General::swroot}/firewall/input"){
+		&buildrules(\%configinputfw);
+	}
+	if (! -z  "${General::swroot}/firewall/outgoing"){
+		&buildrules(\%configoutgoingfw);
+	}
+	if (! -z  "${General::swroot}/firewall/config"){
+		&buildrules(\%configfwdfw);
+	}
 
 	# Load P2P block rules.
 	&p2pblock();
 
 	# Reload firewall policy.
 	run("/usr/sbin/firewall-policy");
+
+	#Reload firewall.local if present
+	if ( -f '/etc/sysconfig/firewall.local'){
+		run("/etc/sysconfig/firewall.local reload");
+	}
 }
 
 sub run {
@@ -146,18 +159,6 @@ sub flush {
 	run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX");
 }
 
-sub preparerules {
-	if (! -z  "${General::swroot}/firewall/input"){
-		&buildrules(\%configinputfw);
-	}
-	if (! -z  "${General::swroot}/firewall/outgoing"){
-		&buildrules(\%configoutgoingfw);
-	}
-	if (! -z  "${General::swroot}/firewall/config"){
-		&buildrules(\%configfwdfw);
-	}
-}
-
 sub buildrules {
 	my $hash = shift;
 
@@ -512,10 +513,6 @@ sub buildrules {
 			}
 		}
 	}
-	#Reload firewall.local if present
-	if ( -f '/etc/sysconfig/firewall.local'){
-		run("/etc/sysconfig/firewall.local reload");
-	}
 }
 
 # Formats the given timestamp into the iptables format which is "hh:mm" UTC.


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