Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 5424a1e123a8d443b3fcb135a30f25162ae44859..f4823fcfbde655009d95b59401a19643f99e83e5 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        #
@@ -120,11 +120,14 @@ elsif ($ARGV[0] eq 'restore') {
   #PORTFORWARD CONVERTER
   if( -d "${General::swroot}/portfw"){
        #START CONVERTER "PORTFW"
-       System("/usr/sbin/convert-portfw");
+       system("/usr/sbin/convert-portfw");
        rmtree("${General::swroot}/portfw");
   }
   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]");