From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Aug 2013 11:43:05 +0000 (+0200)
Subject: firewall: Convert filewall rules when updating to fifteen.
X-Git-Tag: v2.15-beta1~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d0aa7108271be3a3e7cfb99e3b1b560cbab9b07;p=ipfire-2.x.git

firewall: Convert filewall rules when updating to fifteen.
---

diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
new file mode 100644
index 0000000000..3eb6cba944
--- /dev/null
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -0,0 +1,4 @@
+usr/bin/convert-dmz
+usr/bin/convert-outgoingfw
+usr/bin/convert-portfw
+usr/bin/convert-xtaccess
diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index f03f55847e..1e5521229e 100644
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -44,6 +44,15 @@ extract_files
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Convert firewall configuration
+/usr/bin/convert-xtaccess
+/usr/bin/convert-outgoingfw
+/usr/bin/convert-portfw
+/usr/bin/convert-dmz
+
+# Remove old firewall configuration files
+rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
+
 sync
 
 # This update need a reboot...