Forward Firewall: edited Backup.pl. If someone put /var/ipfire/outgoing into /var...

Now the backup takes care of this and checks if there are old rules to convert.

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 28129e46ecc9747e8f588e1801f15fe5096e9c2f..b21716185eaad0bdbf653b36ed97b23ff97e9ebb 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -64,13 +64,24 @@ elsif ($ARGV[0] eq 'restore') {
   system("cd / && tar -xvz -p -f /tmp/restore.ipf");
   #Here some converter scripts to correct old Backups (before core 65)
   system("/usr/sbin/ovpn-ccd-convert");
-  if( -d "/var/ipfire/outgoing"){
+  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}/forward/input" ){ 
+                 unlink("${General::swroot}/forward/input");
+                 system("touch ${General::swroot}/forward/input"); 
+                 chown 99,99,"${General::swroot}/forward/input";
+         } 
          system("/usr/sbin/convert-outgoingfw");
-         rmtree("/var/ipfire/outgoing");
+         rmtree("${General::swroot}/outgoing");
+         system("/usr/local/bin/forwrdfwctrl");
   }
-  if( -d "/var/ipfire/xtaccess"){
+  if( -d "${General::swroot}/xtaccess"){
          system("/usr/sbin/convert-xtaccess");
-         rmtree("/var/ipfire/xtaccess");
+         rmtree("${General::swroot}/xtaccess");
   }
  }
 elsif ($ARGV[0] eq 'restoreaddon') {

diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/config/forwardfw/convert-xtaccess b/config/forwardfw/convert-xtaccess
old mode 100644 (file)
new mode 100755 (executable)