avast: change 'scan' invocation

[pmg-api.git] / PMG / Backup.pm

diff --git a/PMG/Backup.pm b/PMG/Backup.pm
index 8c2e03c4db1ee3d848f448783bcc95e30bacdc0b..a451c6c9082b16eea4d377ce8ef96c25583cf1eb 100644 (file)
--- a/PMG/Backup.pm
+++ b/PMG/Backup.pm
@@ -11,6 +11,8 @@ use PVE::Tools;
 use PMG::pmgcfg;
 use PMG::AtomicFile;
 
+my $sa_custom_config_fn = "/etc/mail/spamassassin/custom.cf";
+
 sub dump_table {
     my ($dbh, $table, $ofh, $seq, $seqcol) = @_;
 
@@ -179,28 +181,18 @@ sub pmg_backup {
        print $vfh "product: $pkg\nversion: $ver\nbackuptime:$time:$now\n";
        $vfh->close(1);
 
-       my $sshfiles = -d '/root/.ssh' ? '/root/.ssh' : '';
-
-       my $extra_cfgs = '/etc/passwd /etc/group';
-
-       my $extra_fn = '/etc/shadow';
-       $extra_cfgs .= " $extra_fn" if -e $extra_fn;
-
-       $extra_fn = '/etc/gshadow';
-       $extra_cfgs .= " $extra_fn" if -e $extra_fn;
+       my $extra_cfgs =  [];
 
-       $extra_fn = '/etc/mail/spamassassin/custom.cf';
-       $extra_cfgs .= " $extra_fn" if -e $extra_fn;
+       push @$extra_cfgs, $sa_custom_config_fn;
 
-       #$extra_fn = '/etc/postfix/tls_policy';
-       #$extra_cfgs .= " $extra_fn" if -e $extra_fn;
+       #push @$extra_cfgs, '/etc/postfix/tls_policy';
 
        my $extradb = $include_statistics ? $statfn : '';
 
-       # we do not store cluster configurations (cluster.cfg)
+       my $extra = join(' ', @$extra_cfgs);
 
        system("/bin/tar cf $dirname/$tarfn -C / " .
-              "/etc/pmg $sshfiles $extra_cfgs>/dev/null 2>&1") == 0 ||
+              "/etc/pmg $extra>/dev/null 2>&1") == 0 ||
               die "unable to create system configuration backup: ERROR";
 
        system("cd $dirname; md5sum $tarfn $dbfn $extradb $verfn> $sigfn") == 0 ||
@@ -253,13 +245,18 @@ sub pmg_restore {
            unlink "$dirname/config/etc/pmg/cluster.conf"; # never restore cluster config
            rmtree "$dirname/config/etc/pmg/master";
 
-           # backup old config to /etc/pmg.oldremove current config
-           rmtree "/etc/pmg";
-           mkdir "/etc/pmg";
+           # remove current config, but keep directory for INotify
+           rmtree("/etc/pmg", { keep_root => 1 });
            # copy files
            system("cp -a $dirname/config/etc/pmg/* /etc/pmg/") == 0 ||
                die "unable to restore system configuration: ERROR";
 
+           if (-f "$dirname/config/${sa_custom_config_fn}") {
+               my $data = PVE::Tools::file_get_contents(
+                   "$dirname/config/${sa_custom_config_fn}", 1024*1024);
+               PVE::Tools::file_set_contents($sa_custom_config_fn, $data);
+           }
+
            my $cfg = PMG::Config->new();
            my $ruledb = PMG::RuleDB->new();
            my $rulecache = PMG::RuleCache->new($ruledb);
@@ -277,8 +274,6 @@ sub pmg_restore {
 
            print "Create new database\n";
            my $dbh = PMG::DBTools::create_ruledb($dbname);
-           my $ruledb = PMG::RuleDB->new($dbh);
-           PMG::DBTools::init_ruledb($ruledb);
 
            system("cat $dirname/$dbfn|psql $dbname >/dev/null 2>&1") == 0 ||
                die "unable to restore rule database: ERROR";
@@ -294,6 +289,7 @@ sub pmg_restore {
            PMG::DBTools::postgres_admin_cmd('psql', { input => 'analyze;' }, $dbname);
 
            print "Analyzing/Upgrading existing Databases...";
+           my $ruledb = PMG::RuleDB->new($dbh);
            PMG::DBTools::upgradedb($ruledb);
            print "done\n";