From a5df60c3f837a34099308ee482799371dd7396a4 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 19 May 2014 09:45:08 +0000
Subject: [PATCH] backup: enable configDB / add Warning. Forum #23650

git-svn-id: https://svn.fhem.de/fhem/trunk@5893 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_backup.pm | 24 +++++++++++++++---------
 fhem/FHEM/98_update.pm |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/fhem/FHEM/98_backup.pm b/fhem/FHEM/98_backup.pm
index dfea43611..ad717aa4d 100644
--- a/fhem/FHEM/98_backup.pm
+++ b/fhem/FHEM/98_backup.pm
@@ -49,12 +49,12 @@ CommandBackup($$)
   my ($cl, $param) = @_;
 
   my $modpath = $attr{global}{modpath};
-  my $configfile = (!defined($attr{global}{configfile}) ? undef : $attr{global}{configfile});
-  my $statefile  = (!defined($attr{global}{statefile}) ? undef : $attr{global}{statefile});
+  my $configfile = AttrVal("global", "configfile", undef);
+  my $statefile  = AttrVal("global", "statefile", undef);
   my $msg;
   my $ret;
 
-  return "Backup is not supported for configDB" if(configDBUsed());
+  Log 1, "NOTE: make sure you have a database backup!" if(configDBUsed());
 
   # set backupdir
   my $backupdir;
@@ -81,12 +81,18 @@ CommandBackup($$)
     }
   }
 
-  # get pathnames to archiv
-  push @pathname, $configfile;
-  Log 4, "backup include: '$configfile'";
-  $ret = parseConfig($configfile);
-  push @pathname, $statefile;
-  Log 4, "backup include: '$statefile'";
+  if(configDBUsed()) {
+    # add configDB configuration file
+    push @pathname, 'configDB.conf';
+    Log 4, "backup include: 'configDB.conf'";
+  } else {
+    # get pathnames to archiv
+    push @pathname, $configfile;
+    Log 4, "backup include: '$configfile'";
+    $ret = parseConfig($configfile);
+    push @pathname, $statefile;
+    Log 4, "backup include: '$statefile'";
+  }
   $ret = readModpath($modpath,$backupdir);
 
   # create archiv
diff --git a/fhem/FHEM/98_update.pm b/fhem/FHEM/98_update.pm
index 17ea2dcce..138d4ae74 100644
--- a/fhem/FHEM/98_update.pm
+++ b/fhem/FHEM/98_update.pm
@@ -433,7 +433,7 @@ update_DoUpdate(@)
 
   # do a backup first
   my $configfile = AttrVal("global", "configfile", "");
-  my $doBackup = AttrVal("global", "backup_before_update", !configDBUsed());
+  my $doBackup = AttrVal("global", "backup_before_update", 1);
 
   if ($doBackup) {
     my $cmdret = AnalyzeCommand(undef, "backup");