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 (file)
index 0000000..3eb6cba
--- /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 f03f55847e5d97a7f52b34c5a8a6bf747539a62d..1e5521229e92c95fa75474deafbda9d9a894e21c 100644 (file)
--- 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...