Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall

[people/pmueller/ipfire-2.x.git] / config / firewall / convert-outgoingfw

diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
index bd33059301c37f56d8ff08e5d3943eab5e85bad2..f832a2c549de61b2759611270de3bfe8330d82be 100755 (executable)
--- a/config/firewall/convert-outgoingfw
+++ b/config/firewall/convert-outgoingfw
@@ -44,9 +44,9 @@ my $configgroups      = "${General::swroot}/fwhosts/customgroups";
 my $ovpnsettings       = "${General::swroot}/ovpn/settings";
 my $ovpnconfig         = "${General::swroot}/ovpn/ovpnconfig";
 my $ccdconfig          = "${General::swroot}/ovpn/ccd.conf";
-my $fwdfwconfig                = "${General::swroot}/forward/config";
-my $outfwconfig                = "${General::swroot}/forward/outgoing";
-my $fwdfwsettings      = "${General::swroot}/forward/settings";
+my $fwdfwconfig                = "${General::swroot}/firewall/config";
+my $outfwconfig                = "${General::swroot}/firewall/outgoing";
+my $fwdfwsettings      = "${General::swroot}/firewall/settings";
 my @ipgroups = qx(ls $ipgrouppath);
 my @macgroups = qx(ls $macgrouppath);
 my @hostarray=();
@@ -699,6 +699,6 @@ sub build_ovpn_grp
 }
 sub process_p2p
 {
-       copy("/var/ipfire/outgoing/p2protocols","/var/ipfire/forward/p2protocols");
-       chmod oct('0777'), '/var/ipfire/forward/p2protocols';
+       copy("/var/ipfire/outgoing/p2protocols","/var/ipfire/firewall/p2protocols");
+       chmod oct('0777'), '/var/ipfire/firewall/p2protocols';
 }