Merge commit '961f3dbcd8675f8b62ecd2404a709e47ec2ae343' into fifteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / core / fifteen / filelists / firewall

diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
index fc505981cdf9fd56d782a3e77d55dfb7ed5e8c61..3edde8eb302a4d3b09020a7a53b2cd166a89d9f2 100644 (file)
--- a/config/rootfiles/core/fifteen/filelists/firewall
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -1,6 +1,6 @@
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
-srv/web/ipfire/cgi-bin/forwardfw.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/p2p-block.cgi
@@ -9,16 +9,14 @@ usr/sbin/convert-outgoingfw
 usr/sbin/convert-portfw
 usr/sbin/convert-xtaccess
 usr/sbin/firewall-policy
-var/ipfire/forward
-var/ipfire/forward/bin/firewall-lib.pl
-var/ipfire/forward/bin/rules.pl
-var/ipfire/forward/config
-var/ipfire/forward/dmz
-var/ipfire/forward/input
-var/ipfire/forward/nat
-var/ipfire/forward/outgoing
-var/ipfire/forward/p2protocols
-var/ipfire/forward/settings
+var/ipfire/firewall
+var/ipfire/firewall/bin/firewall-lib.pl
+var/ipfire/firewall/bin/rules.pl
+var/ipfire/firewall/config
+var/ipfire/firewall/input
+var/ipfire/firewall/outgoing
+var/ipfire/firewall/p2protocols
+var/ipfire/firewall/settings
 var/ipfire/fwhosts
 var/ipfire/fwhosts/customhosts
 var/ipfire/fwhosts/customnetworks