Updates backupninja config

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 8660bcc27d20af23b7c28f403b10574f10e2649a..82f057d4585d1434c5dd4389dff813a6d349ad6e 100644 (file)
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -17,8 +17,6 @@ define backup::duplicity(
   $exclude_unencrypted = $backup::params::exclude_unencrypted
   $include_unencrypted = $backup::params::include_unencrypted
 
-  include backupninja
-
   # backup dest folder
   file { "${backup::params::backupdir}/duplicity":
     ensure  => directory,

diff --git a/manifests/init.pp b/manifests/init.pp
index cf36fb904748727ca484d66d89c40fe12d91d762..eea4cd2d980a79cade5e42eb31041c82aec6070e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,6 +32,7 @@ class backup(
   class { 'backupninja':
     loglvl                     => 4,
     usecolors                  => false,
+    keymanage                  => false,
     when                       => $when,
     reportwarning              => $reportwarning,
     ensure_hwinfo_version      => $hwinfo,
@@ -41,6 +42,7 @@ class backup(
   class { 'backupninja::server':
     backupdir             => $backup::params::backupdir,
     backupdir_ensure      => $backup::params::backupdir_ensure,
+    use_storedconfigs     => false,
   }
 
   package { "debconf-utils": ensure => installed, }

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index eecb1f6cff541e975a34c69d6818aa55c734ea16..8bc5cff529c63beb75e96c3b24ac73301915ba9d 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -17,7 +17,6 @@ define backup::rdiff(
     subfolder      => "rdiff",
     user           => "$hostname",
     sshoptions     => "-p $port",
-    keymanage      => false,
     backupkeytype  => "rsa",
     backupkeystore => "puppet:///pubkeys",
   }

diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 733885b38135a7ef6ae81060ac220853b1a8d6d9..ff62b8049415fc576bfc337b4a80ccf9ea63a0f4 100644 (file)
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -8,7 +8,6 @@ define backup::rsync(
   backupninja::rsync { "rsync-$title.$use_domain":
     # [general]
     ensure         => $ensure,
-    keymanage      => false,
     home           => "${backup::params::backupdir}/remote/$use_fqdn",
     backupkeytype  => "rsa",
     id_file        => "/root/.ssh/id_rsa",