Merge remote-tracking branch 'glotzi/nut-update' into next

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

diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
index ea493752e15e3d59192b30f932598498186dbad6..c917f8438491b243f2c99866b084fe4be301a26e 100755 (executable)
--- a/config/firewall/convert-outgoingfw
+++ b/config/firewall/convert-outgoingfw
@@ -78,6 +78,11 @@ else
 
 if (! -s "$outfwsettings") {
         print "Empty DMZ configuration file. Nothing to do. Exiting...\n";
+        #Fill the firewall settings file
+       open (SETTINGS, ">/var/ipfire/firewall/settings");
+       print SETTINGS "POLICY=MODE2\n";
+       print SETTINGS "POLICY1=MODE2\n";
+       close (SETTINGS);
         exit(0);
 }
 
@@ -422,8 +427,8 @@ sub process_rules
                                $grp1='std_net_src';
                                $source='ORANGE';
                        }elsif ($configline[2] eq 'red') {
-                               $grp1='std_net_src';
-                               $source='IPFire';
+                               $grp1='ipfire_src';
+                               $source='RED1';
                                &General::readhash($fwdfwsettings,\%fwdsettings);
                                $fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
                                $fwdsettings{'POLICY'}=$outsettings{'POLICY'};
@@ -533,7 +538,7 @@ sub process_rules
                my $chain;
                foreach my $protocol (@prot){
                        my $now=localtime;
-                       if ($source eq 'IPFire'){
+                       if ($source eq 'RED1'){
                                $chain='OUTGOINGFW';
                        }else{
                                $chain='FORWARDFW';