Merge remote-tracking branch 'mfischer/slang' into next

[people/pmueller/ipfire-2.x.git] / config / backup / backup.pl

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 28e2dd89eb4bef6a1fc6371ce6f4884d83bfc0f0..d430f34674a83d80505c01e94d85f34f44ef05d7 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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,39 +97,37 @@ 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");
- }
+  system("/usr/local/bin/firewallctrl");
+
+  # Convert old OpenVPN CCD files (CN change, core 75).
+  system("/usr/local/bin/convert-ovpn");
+}
 elsif ($ARGV[0] eq 'restoreaddon') {
   if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
   system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]");
@@ -162,12 +160,10 @@ sub createinclude(){
   close(DATEI);
   
   foreach (@Zeilen){
-  if ( $_ =~ /\*/){
-    my @files = `ls $_`;
+    chomp($_);
+    my @files = `find $_ -maxdepth 0 2>/dev/null`;
     foreach (@files){
       push(@include,$_);
-     }
-   }
-  else {push(@include,$_);}
+    }
   }
 }