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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2846 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  e8c070037f574d10cca8e66b2d8f1b0bbcfdd30d (commit)
       via  f4c3f51441bc9420a645f23ae5f53c651ff53ee9 (commit)
      from  5aef2fe3bd622d89ff8473a18099da6c1fa8c3fe (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 e8c070037f574d10cca8e66b2d8f1b0bbcfdd30d
Merge: f4c3f51 5aef2fe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 20 11:02:27 2013 +0200

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

commit f4c3f51441bc9420a645f23ae5f53c651ff53ee9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 20 10:59:31 2013 +0200

    outgoing firewall: Reload firewall.local when changing outgoing fw.

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

Summary of changes:
 config/outgoingfw/outgoingfw.pl          | 11 +++++++++++
 config/rootfiles/core/70/filelists/files |  1 +
 2 files changed, 12 insertions(+)

Difference in files:
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 7dd1430..1208567 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -105,6 +105,7 @@ system("/sbin/iptables --delete-chain OUTGOINGFWMAC >/dev/null 2>&1");
 system("/sbin/iptables -N OUTGOINGFWMAC >/dev/null 2>&1");
 
 if ( $outfwsettings{'POLICY'} eq 'MODE0' ) {
+	&firewall_local_reload();
 	exit 0
 }
 
@@ -264,6 +265,8 @@ if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
 	applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0);
 }
 
+&firewall_local_reload();
+
 sub applyrule($$) {
 	my $cmd = shift;
 	my $macrule = shift;
@@ -273,3 +276,11 @@ sub applyrule($$) {
 		system("/sbin/iptables -A OUTGOINGFW $cmd");
 	}
 }
+
+sub firewall_local_reload() {
+	my $script = "/etc/sysconfig/firewall.local";
+
+	if ( -x $script ) {
+		system("$script reload >/dev/null 2>&1");
+	}
+}
diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files
index 683da92..52b9be7 100644
--- a/config/rootfiles/core/70/filelists/files
+++ b/config/rootfiles/core/70/filelists/files
@@ -49,3 +49,4 @@ usr/lib/squid/errors/tr/ERR_ZERO_SIZE_OBJECT
 usr/lib/squid/errors/tr/error-details.txt
 usr/local/bin/setddns.pl
 var/ipfire/general-functions.pl
+var/ipfire/outgoing/bin/outgoingfw.pl


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