avast: change 'scan' invocation

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

diff --git a/PMG/Backup.pm b/PMG/Backup.pm
index 648a9ac3979e229bcd40d7ad554fc32291ea4346..a451c6c9082b16eea4d377ce8ef96c25583cf1eb 100644 (file)
--- a/PMG/Backup.pm
+++ b/PMG/Backup.pm
@@ -11,7 +11,7 @@ use PVE::Tools;
 use PMG::pmgcfg;
 use PMG::AtomicFile;
 
-my $sa_custon_config_fn = "/etc/mail/spamassassin/custom.cf";
+my $sa_custom_config_fn = "/etc/mail/spamassassin/custom.cf";
 
 sub dump_table {
     my ($dbh, $table, $ofh, $seq, $seqcol) = @_;
@@ -183,7 +183,7 @@ sub pmg_backup {
 
        my $extra_cfgs =  [];
 
-       push @$extra_cfgs, $sa_custon_config_fn;
+       push @$extra_cfgs, $sa_custom_config_fn;
 
        #push @$extra_cfgs, '/etc/postfix/tls_policy';
 
@@ -245,17 +245,16 @@ 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_custon_config_fn}") {
+           if (-f "$dirname/config/${sa_custom_config_fn}") {
                my $data = PVE::Tools::file_get_contents(
-                   "$dirname/config/${sa_custon_config_fn}", 1024*1024);
-               PVE::Tools::file_set_contents($sa_custon_config_fn, $data);
+                   "$dirname/config/${sa_custom_config_fn}", 1024*1024);
+               PVE::Tools::file_set_contents($sa_custom_config_fn, $data);
            }
 
            my $cfg = PMG::Config->new();