From: Alexander Marx Date: Thu, 24 Oct 2013 07:24:12 +0000 (+0200) Subject: Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall X-Git-Tag: v2.15-beta1~184 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d8eb5dec7bf36f9b1bd53c9354d980aea315d89;p=people%2Fms%2Fipfire-2.x.git Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall --- diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 28e2dd89eb..b9b7d2c823 100644 --- 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 41ae8b5767..83db2348b9 100644 --- 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 551b52df28..1d55e4acd4 100644 --- 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 8236f07ab0..5a7a8c957d 100644 --- 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 efc4386b4d..0f7c68e29a 100755 --- 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 bd33059301..f832a2c549 100755 --- 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 a37383e312..f6ddd25a53 100755 --- 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 d86c445afc..e04ab6df51 100755 --- 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 6f7e95c0f9..6d26d5b2cf 100755 --- 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 b3be47da03..c724aa840c 100755 --- 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 7796d86658..7fdc983ea2 100644 --- 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 c5c0dac607..8c53a88512 100644 --- 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 868cc85ee4..c7c9fbda7b 100755 --- 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 ""; 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""; @@ -2715,7 +2715,7 @@ END print "$title1
"; print"
$Lang::tr{'fwdfw final_rule'}$Lang::tr{'fwdfw pol block'}
$Lang::tr{'fwhost empty'}
"; 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 ""; 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 ebd1fdce8a..fd66a49414 100755 --- 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 713f37f9fd..08cf04cba5 100644 --- 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 f012358849..7eccf988ee 100644 --- 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 bb0d0aecdf..aab2d3d1c4 100755 --- 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 05ceb3e851..f73453d91c 100644 --- 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 9f3f28e8be..97de2715ff 100644 --- 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;