diff options
| -rw-r--r-- | manifests/duplicity.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 1 | ||||
| -rw-r--r-- | manifests/rsync.pp | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index 8660bcc..82f057d 100644 --- 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 cf36fb9..eea4cd2 100644 --- 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 eecb1f6..8bc5cff 100644 --- 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 733885b..ff62b80 100644 --- 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", |