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

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 28e2dd89eb4bef6a1fc6371ce6f4884d83bfc0f0..b9b7d2c823c23701db5a37fee28fa39b6f00a6d6 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -66,15 +66,15 @@ elsif ($ARGV[0] eq 'restore') {
   system("/usr/sbin/ovpn-ccd-convert");
   #OUTGOINGFW CONVERTER
   if( -d "${General::swroot}/outgoing"){
-         if( -f "${General::swroot}/forward/config" ){
-                 unlink("${General::swroot}/forward/config");
-                 system("touch ${General::swroot}/forward/config");
-                 chown 99,99,"${General::swroot}/forward/config";
+         if( -f "${General::swroot}/firewall/config" ){
+                 unlink("${General::swroot}/firewall/config");
+                 system("touch ${General::swroot}/firewall/config");
+                 chown 99,99,"${General::swroot}/firewall/config";
          }
-         if( -f "${General::swroot}/forward/outgoing" ){
-                 unlink("${General::swroot}/forward/outgoing");
-                 system("touch ${General::swroot}/forward/outgoing");
-                 chown 99,99,"${General::swroot}/forward/outgoing";
+         if( -f "${General::swroot}/firewall/outgoing" ){
+                 unlink("${General::swroot}/firewall/outgoing");
+                 system("touch ${General::swroot}/firewall/outgoing");
+                 chown 99,99,"${General::swroot}/firewall/outgoing";
          }
          unlink("${General::swroot}/fwhosts/customgroups");
          unlink("${General::swroot}/fwhosts/customhosts");
@@ -97,36 +97,31 @@ elsif ($ARGV[0] eq 'restore') {
   }
   #XTACCESS CONVERTER
   if( -d "${General::swroot}/xtaccess"){
-         if( -f "${General::swroot}/forward/input" ){
-                 unlink("${General::swroot}/forward/input");
-                 system("touch ${General::swroot}/forward/input");
+         if( -f "${General::swroot}/firewall/input" ){
+                 unlink("${General::swroot}/firewall/input");
+                 system("touch ${General::swroot}/firewall/input");
          }
          #START CONVERTER "XTACCESS"
          system("/usr/sbin/convert-xtaccess");
-         chown 99,99,"${General::swroot}/forward/input";
+         chown 99,99,"${General::swroot}/firewall/input";
          rmtree("${General::swroot}/xtaccess");
   }
   #DMZ-HOLES CONVERTER
-  if( -d "${General::swroot}/dmzholes"){
-         if( -f "${General::swroot}/forward/dmz" ){
-                 unlink("${General::swroot}/forward/dmz");
-                 system("touch ${General::swroot}/forward/dmz");
+  if( -d "${General::swroot}/dmzholes" || -d "${General::swroot}/portfw"){
+         if( -f "${General::swroot}/firewall/config" ){
+                 unlink("${General::swroot}/firewall/config");
+                 system("touch ${General::swroot}/firewall/config");
          }
          #START CONVERTER "DMZ-HOLES"
          system("/usr/sbin/convert-dmz");
-         chown 99,99,"${General::swroot}/forward/dmz";
+         chown 99,99,"${General::swroot}/firewall/config";
          rmtree("${General::swroot}/dmzholes");
   }
   #PORTFORWARD CONVERTER
   if( -d "${General::swroot}/portfw"){
-         if( -f "${General::swroot}/forward/nat" ){
-                 unlink("${General::swroot}/forward/nat");
-                 system("touch ${General::swroot}/forward/nat");
-         }
-         #START CONVERTER "PORTFW"
-         system("/usr/sbin/convert-portfw");
-         chown 99,99,"${General::swroot}/forward/nat";
-         rmtree("${General::swroot}/portfw");
+       #START CONVERTER "PORTFW"
+       System("/usr/sbin/convert-portfw");
+       rmtree("${General::swroot}/portfw");
   }
   system("/usr/local/bin/forwardfwctrl");
  }

diff --git a/config/backup/exclude b/config/backup/exclude
index 41ae8b576753ed90c2b338dbb0bfdd59959edf46..83db2348b9af77f03d3e5a36e2691bce6853bb09 100644 (file)
--- a/config/backup/exclude
+++ b/config/backup/exclude
@@ -1,7 +1,6 @@
 *.tmp
 /var/ipfire/ethernet/settings
-/var/ipfire/forward/bin/*
+/var/ipfire/firewall/bin/*
 /var/ipfire/proxy/calamaris/bin/*
 /var/ipfire/qos/bin/qos.pl
 /var/ipfire/urlfilter/blacklists/*/*.db
-/var/ipfire/forward/bin/*

diff --git a/config/backup/include b/config/backup/include
index 551b52df287a01041009944fa4be92288b0007a5..1d55e4acd4890c2e6606b53659dcbaf50a74003c 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -15,7 +15,7 @@
 /var/ipfire/auth/users
 /var/ipfire/dhcp/*
 /var/ipfire/dnsforward/*
-/var/ipfire/forward
+/var/ipfire/firewall
 /var/ipfire/fwhosts
 /var/ipfire/main/*
 /var/ipfire/ovpn

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8236f07ab0dd1d25a6fc7443c5c1c8d6aaade688..5a7a8c957d684b36d0eac0be42b2524fd450ad46 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1137,7 +1137,7 @@ sub write_file_utf8 ($) {
        return; 
 }
 
-my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/forward/reread";
+my $FIREWALL_RELOAD_INDICATOR = "${General::swroot}/firewall/reread";
 
 sub firewall_config_changed() {
        open FILE, ">$FIREWALL_RELOAD_INDICATOR" or die "Could not open $FIREWALL_RELOAD_INDICATOR";

diff --git a/config/firewall/convert-dmz b/config/firewall/convert-dmz
index efc4386b4d123cdca978101f4812c1cdb154bdee..0f7c68e29a6d0dcd37dbcf62405f98b38d94a3da 100755 (executable)
--- a/config/firewall/convert-dmz
+++ b/config/firewall/convert-dmz
@@ -33,7 +33,7 @@ my %ifaces=();
 my %configfwdfw=();
 require '/var/ipfire/general-functions.pl';
 my $dmzconfig    = "${General::swroot}/dmzholes/config";
-my $fwdfwconfig   = "${General::swroot}/forward/config";
+my $fwdfwconfig   = "${General::swroot}/firewall/config";
 my $ifacesettings = "${General::swroot}/ethernet/settings";
 my $field0     = 'ACCEPT';
 my $field1     = 'FORWARDFW';

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';
 }

diff --git a/config/firewall/convert-portfw b/config/firewall/convert-portfw
index a37383e3124e49413a7d47fdbe6648d64a395476..f6ddd25a5322a85ec542c6de576e80a51d3b6fc8 100755 (executable)
--- a/config/firewall/convert-portfw
+++ b/config/firewall/convert-portfw
@@ -24,14 +24,14 @@
 # STEP1: read old config and normalize settings                               #
 # STEP2: create new rules from old ones                                       #
 # STEP3: check if rule already exists, when not, put it into                  #
-#        /var/ipfire/forward/nat                                              #
+#        /var/ipfire/firewall/config                                          #
 ###############################################################################
 require '/var/ipfire/general-functions.pl';
 my @values=();
 my @built_rules=();
 my %nat=();
 my $portfwconfig       = "${General::swroot}/portfw/config";
-my $confignat          = "${General::swroot}/forward/config";
+my $confignat          = "${General::swroot}/firewall/config";
 my ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark);
 my ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1);
 my $count=0;

diff --git a/config/firewall/convert-xtaccess b/config/firewall/convert-xtaccess
index d86c445afc2067b905f93181e0977c28543d6e97..e04ab6df516fe02b5648af6f9d9dd44a95b9f1f2 100755 (executable)
--- a/config/firewall/convert-xtaccess
+++ b/config/firewall/convert-xtaccess
@@ -28,7 +28,7 @@ my @alias=();
 my %configinputfw=();
 require '/var/ipfire/general-functions.pl';
 my $xtaccessconfig     = "${General::swroot}/xtaccess/config";
-my $inputfwconfig = "${General::swroot}/forward/input";
+my $inputfwconfig = "${General::swroot}/firewall/input";
 my $aliasconfig        = "${General::swroot}/ethernet/aliases";
 my $field0='ACCEPT';
 my $field1='INPUTFW';

diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy
index 6f7e95c0f936b29261ee44351fcda823c5c38dcb..6d26d5b2cf156d0e43f2251ba124a1e31b599e22 100755 (executable)
--- a/config/firewall/firewall-policy
+++ b/config/firewall/firewall-policy
@@ -20,7 +20,7 @@
 ###############################################################################
 
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/firewall/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
 
 iptables -F POLICYFWD

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index b3be47da03506e0bfbcfd673408bff389a113808..c724aa840cbd7214624e99c0dd1dda0f9bbd7729 100755 (executable)
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -45,12 +45,12 @@ my @DPROT=();
 my @p2ps=();
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
-require "${General::swroot}/forward/bin/firewall-lib.pl";
+require "${General::swroot}/firewall/bin/firewall-lib.pl";
 
-my $configfwdfw                = "${General::swroot}/forward/config";
-my $configinput            = "${General::swroot}/forward/input";
-my $configoutgoing  = "${General::swroot}/forward/outgoing";
-my $p2pfile                    = "${General::swroot}/forward/p2protocols";
+my $configfwdfw                = "${General::swroot}/firewall/config";
+my $configinput            = "${General::swroot}/firewall/input";
+my $configoutgoing  = "${General::swroot}/firewall/outgoing";
+my $p2pfile                    = "${General::swroot}/firewall/p2protocols";
 my $configgrp          = "${General::swroot}/fwhosts/customgroups";
 my $netsettings                = "${General::swroot}/ethernet/settings";
 my $errormessage       = '';
@@ -64,7 +64,7 @@ my $command                   = 'iptables -A';
 my $dnat                       ='';
 my $snat                       ='';
 
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
 &General::readhash("$netsettings", \%defaultNetworks);
 &General::readhasharray($configfwdfw, \%configfwdfw);
 &General::readhasharray($configinput, \%configinputfw);
@@ -127,13 +127,13 @@ sub flush
 }
 sub preparerules
 {
-       if (! -z  "${General::swroot}/forward/config"){
+       if (! -z  "${General::swroot}/firewall/config"){
                &buildrules(\%configfwdfw);
        }
-       if (! -z  "${General::swroot}/forward/input"){
+       if (! -z  "${General::swroot}/firewall/input"){
                &buildrules(\%configinputfw);
        }
-       if (! -z  "${General::swroot}/forward/outgoing"){
+       if (! -z  "${General::swroot}/firewall/outgoing"){
                &buildrules(\%configoutgoingfw);
        }
 }

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 7796d86658078791654fae1fe1d1eddf67b3ea2d..7fdc983ea2febf203ab7bf384224473a722f5a0d 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -49,17 +49,17 @@ var/ipfire/extrahd
 #var/ipfire/extrahd/partitions
 #var/ipfire/extrahd/scan
 #var/ipfire/extrahd/settings
-var/ipfire/forward
-#var/ipfire/forward/bin
-#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
+#var/ipfire/firewall/bin/firewall-lib.pl
+#var/ipfire/firewall/bin/rules.pl
+#var/ipfire/firewall/config
+#var/ipfire/firewall/dmz
+#var/ipfire/firewall/input
+#var/ipfire/firewall/nat
+#var/ipfire/firewall/outgoing
+#var/ipfire/firewall/p2protocols
+#var/ipfire/firewall/settings
 var/ipfire/fwhosts
 #var/ipfire/fwhosts/customgroups
 #var/ipfire/fwhosts/customhosts

diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
index c5c0dac6072918ecfa0ec91da84df6e4eaaf846b..8c53a88512a1c39cd3a2a679507c6d7f6eec1077 100644 (file)
--- a/config/rootfiles/core/fifteen/filelists/firewall
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -9,16 +9,16 @@ 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/dmz
+var/ipfire/firewall/input
+var/ipfire/firewall/nat
+var/ipfire/firewall/outgoing
+var/ipfire/firewall/p2protocols
+var/ipfire/firewall/settings
 var/ipfire/fwhosts
 var/ipfire/fwhosts/customhosts
 var/ipfire/fwhosts/customnetworks

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 868cc85ee454bcd113c2f9ebf87a7fb0592852d8..c7c9fbda7b479a8735133034b24ca8c89f296cf2 100755 (executable)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -29,13 +29,13 @@ no warnings 'uninitialized';
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-require "${General::swroot}/forward/bin/firewall-lib.pl";
+require "${General::swroot}/firewall/bin/firewall-lib.pl";
 
-unless (-d "${General::swroot}/forward")                       { system("mkdir ${General::swroot}/forward"); }
-unless (-e "${General::swroot}/forward/settings")   { system("touch ${General::swroot}/forward/settings"); }
-unless (-e "${General::swroot}/forward/config")        { system("touch ${General::swroot}/forward/config"); }
-unless (-e "${General::swroot}/forward/input")         { system("touch ${General::swroot}/forward/input"); }
-unless (-e "${General::swroot}/forward/outgoing")      { system("touch ${General::swroot}/forward/outgoing"); }
+unless (-d "${General::swroot}/firewall")                      { system("mkdir ${General::swroot}/firewall"); }
+unless (-e "${General::swroot}/firewall/settings")     { system("touch ${General::swroot}/firewall/settings"); }
+unless (-e "${General::swroot}/firewall/config")       { system("touch ${General::swroot}/firewall/config"); }
+unless (-e "${General::swroot}/firewall/input")                { system("touch ${General::swroot}/firewall/input"); }
+unless (-e "${General::swroot}/firewall/outgoing")     { system("touch ${General::swroot}/firewall/outgoing"); }
 
 my %fwdfwsettings=();
 my %selected=() ;
@@ -75,9 +75,9 @@ my $configccdnet      = "${General::swroot}/ovpn/ccd.conf";
 my $configccdhost      = "${General::swroot}/ovpn/ovpnconfig";
 my $configipsec                = "${General::swroot}/vpn/config";
 my $configipsecrw      = "${General::swroot}/vpn/settings";
-my $configfwdfw                = "${General::swroot}/forward/config";
-my $configinput                = "${General::swroot}/forward/input";
-my $configoutgoing     = "${General::swroot}/forward/outgoing";
+my $configfwdfw                = "${General::swroot}/firewall/config";
+my $configinput                = "${General::swroot}/firewall/input";
+my $configoutgoing     = "${General::swroot}/firewall/outgoing";
 my $configovpn         = "${General::swroot}/ovpn/settings";
 my $fwoptions          = "${General::swroot}/optionsfw/settings";
 my $ifacesettings      = "${General::swroot}/ethernet/settings";
@@ -87,7 +87,7 @@ my $ipgrp="${General::swroot}/outgoing/groups";
 my $tdcolor='';
 my $checkorange='';
 my @protocols;
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 &General::readhash($fwoptions, \%optionsfw); 
@@ -2687,7 +2687,7 @@ END
                #SHOW FINAL RULE
                print "<table width='100%'rules='cols' border='1'>";
                my $col;
-               if ($config eq '/var/ipfire/forward/config'){
+               if ($config eq '/var/ipfire/firewall/config'){
                        my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
                        if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
                                $col="bgcolor='darkred'";
@@ -2695,7 +2695,7 @@ END
                                $col="bgcolor='green'";
                        }
                        &show_defaultrules($col,$pol);
-               }elsif ($config eq '/var/ipfire/forward/outgoing'){
+               }elsif ($config eq '/var/ipfire/firewall/outgoing'){
                        if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
                                $col="bgcolor='darkred'";
                                print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF' >$Lang::tr{'fwdfw pol block'}</font></td></tr>";
@@ -2715,7 +2715,7 @@ END
                        print "<b>$title1</b><br>";
                        print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
                        my $col;
-                       if ($config eq '/var/ipfire/forward/config'){
+                       if ($config eq '/var/ipfire/firewall/config'){
                                my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
                                if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
                                        $col="bgcolor='darkred'";
@@ -2723,7 +2723,7 @@ END
                                        $col="bgcolor='green'";
                                }
                                &show_defaultrules($col,$pol);
-                       }elsif ($config eq '/var/ipfire/forward/outgoing'){
+                       }elsif ($config eq '/var/ipfire/firewall/outgoing'){
                                print "<table width='100%' rules='cols' border='1'>";
                                my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
                                if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index ebd1fdce8adce7550c4083504d12ba42119cea40..fd66a494145a4e9cb0c51d77829ee87529248a08 100755 (executable)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -60,8 +60,8 @@ my $configccdhost     = "${General::swroot}/ovpn/ovpnconfig";
 my $configipsec                = "${General::swroot}/vpn/config";
 my $configsrv          = "${General::swroot}/fwhosts/customservices";
 my $configsrvgrp       = "${General::swroot}/fwhosts/customservicegrp";
-my $fwconfigfwd                = "${General::swroot}/forward/config";
-my $fwconfiginp                = "${General::swroot}/forward/input";
+my $fwconfigfwd                = "${General::swroot}/firewall/config";
+my $fwconfiginp                = "${General::swroot}/firewall/input";
 my $configovpn         = "${General::swroot}/ovpn/settings";
 my $tdcolor='';
 my $configipsecrw      = "${General::swroot}/vpn/settings";

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 713f37f9fd7d6df885346fac97e7dddaeeae2018..08cf04cba5f22213a34b40ec778d3fd71df69a7d 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -26,13 +26,13 @@ my %fwdfwsettings=();
 my %configfwdfw=();
 my %configoutgoingfw=();
 
-my $configfwdfw                = "${General::swroot}/forward/config";
-my $configoutgoing     = "${General::swroot}/forward/outgoing";
+my $configfwdfw                = "${General::swroot}/firewall/config";
+my $configoutgoing     = "${General::swroot}/firewall/outgoing";
 my $errormessage = '';
 my $warnmessage = '';
 my $filename = "${General::swroot}/optionsfw/settings";
 
-&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+&General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
 &Header::showhttpheaders();
 
 #Get GUI values
@@ -54,8 +54,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
                %fwdfwsettings = ();
                $fwdfwsettings{'POLICY'} = "$MODE";
                $fwdfwsettings{'POLICY1'} = "$MODE1";
-               &General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-               &General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
+               &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings);
+               &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
                system("/usr/local/bin/forwardfwctrl");
        }
        &General::readhash($filename, \%settings);             # Load good settings

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index f0123588492f3524c17beec7b823da2d159ded64..7eccf988ee4b4165df18ea15d8ff5dba7e847e15 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -170,7 +170,7 @@ sub checkportfw {
        my $DPORT = shift;
        my $DPROT = shift;
        my %natconfig =();
-       my $confignat = "${General::swroot}/forward/config";
+       my $confignat = "${General::swroot}/firewall/config";
        $DPROT= uc ($DPROT);
        &General::readhasharray($confignat, \%natconfig);
        foreach my $key (sort keys %natconfig){

diff --git a/html/cgi-bin/p2p-block.cgi b/html/cgi-bin/p2p-block.cgi
index bb0d0aecdfbb1db8e8172c1a33af1ba79ea385c6..aab2d3d1c4117310f7700d92814fcb0d624acdad 100755 (executable)
--- a/html/cgi-bin/p2p-block.cgi
+++ b/html/cgi-bin/p2p-block.cgi
@@ -32,7 +32,7 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
 my $errormessage = '';
-my $p2pfile = "${General::swroot}/forward/p2protocols";
+my $p2pfile = "${General::swroot}/firewall/p2protocols";
 
 my @p2ps = ();
 my %fwdfwsettings = ();

diff --git a/lfs/configroot b/lfs/configroot
index 05ceb3e851ab53fdcafe83c78b7700b39fcd5e12..f73453d91c391e5bf3bc4e7f1b1f1ab9069ca309 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,7 +51,7 @@ $(TARGET) :
 
        # Create all directories
        for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
-                       ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main \
+                       ethernet extrahd/bin fwlogs fwhosts firewall firewall/bin isdn key langs logging mac main \
                        menu.d modem net-traffic net-traffic/templates nfs optionsfw \
                        ovpn patches pakfire portfw ppp private proxy/advanced/cre \
                        proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
@@ -64,7 +64,7 @@ $(TARGET) :
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
-           ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
+           ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/input firewall/outgoing \
            fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
            isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
@@ -99,13 +99,13 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/useragents                 $(CONFIG_ROOT)/proxy/advanced
        cp $(DIR_SRC)/config/cfgroot/ethernet-vlans             $(CONFIG_ROOT)/ethernet/vlans
        cp $(DIR_SRC)/langs/list                                                $(CONFIG_ROOT)/langs/
-       cp $(DIR_SRC)/config/firewall/rules.pl                  $(CONFIG_ROOT)/forward/bin/rules.pl
+       cp $(DIR_SRC)/config/firewall/rules.pl                  $(CONFIG_ROOT)/firewall/bin/rules.pl
        cp $(DIR_SRC)/config/firewall/convert-xtaccess  /usr/sbin/convert-xtaccess
        cp $(DIR_SRC)/config/firewall/convert-outgoingfw        /usr/sbin/convert-outgoingfw
        cp $(DIR_SRC)/config/firewall/convert-dmz       /usr/sbin/convert-dmz
        cp $(DIR_SRC)/config/firewall/convert-portfw    /usr/sbin/convert-portfw
-       cp $(DIR_SRC)/config/firewall/p2protocols               $(CONFIG_ROOT)/forward/p2protocols
-       cp $(DIR_SRC)/config/firewall/firewall-lib.pl   $(CONFIG_ROOT)/forward/bin/firewall-lib.pl
+       cp $(DIR_SRC)/config/firewall/p2protocols               $(CONFIG_ROOT)/firewall/p2protocols
+       cp $(DIR_SRC)/config/firewall/firewall-lib.pl   $(CONFIG_ROOT)/firewall/bin/firewall-lib.pl
        cp $(DIR_SRC)/config/firewall/firewall-policy   /usr/sbin/firewall-policy
        cp $(DIR_SRC)/config/fwhosts/icmp-types                 $(CONFIG_ROOT)/fwhosts/icmp-types
        cp $(DIR_SRC)/config/fwhosts/customservices             $(CONFIG_ROOT)/fwhosts/customservices
@@ -130,11 +130,11 @@ $(TARGET) :
        echo  "SHOWDROPDOWN=off"        >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "DROPWIRELESSINPUT=on"    >> $(CONFIG_ROOT)/optionsfw/settings
        echo  "DROPWIRELESSFORWARD=on"  >> $(CONFIG_ROOT)/optionsfw/settings
-       echo  "POLICY=MODE2"            >> $(CONFIG_ROOT)/forward/settings
-       echo  "POLICY1=MODE2"           >> $(CONFIG_ROOT)/forward/settings
+       echo  "POLICY=MODE2"            >> $(CONFIG_ROOT)/firewall/settings
+       echo  "POLICY1=MODE2"           >> $(CONFIG_ROOT)/firewall/settings
        
        # set rules.pl executable
-       chmod 755 $(CONFIG_ROOT)/forward/bin/rules.pl
+       chmod 755 $(CONFIG_ROOT)/firewall/bin/rules.pl
                
        # set converters executable
        chmod 755 /usr/sbin/convert-*

diff --git a/src/misc-progs/forwardfwctrl.c b/src/misc-progs/forwardfwctrl.c
index 9f3f28e8bee231ffc131c3b7f686e4ddd0f19bce..97de2715ff664bda741617bdfb5c04a456a0fb3e 100644 (file)
--- a/src/misc-progs/forwardfwctrl.c
+++ b/src/misc-progs/forwardfwctrl.c
@@ -13,12 +13,12 @@ int main(int argc, char *argv[]) {
        if (!(initsetuid()))
                exit(1);
 
-       int retval = safe_system("/var/ipfire/forward/bin/rules.pl");
+       int retval = safe_system("/var/ipfire/firewall/bin/rules.pl");
 
        /* If rules.pl has been successfully executed, the indicator
         * file is removed. */
        if (retval == 0) {
-               unlink("/var/ipfire/forward/reread");
+               unlink("/var/ipfire/firewall/reread");
        }
 
        return 0;