diff options
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | manifests/duplicity.pp | 4 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 4 | ||||
| -rw-r--r-- | manifests/rsync.pp | 4 |
4 files changed, 12 insertions, 9 deletions
@@ -24,9 +24,12 @@ $nagios_server. The $manage_nagios parameter also replaces the $use_nagios global. As for handlers, they don't include the backupninja::client anymore and -now read several default values from the backupninja base class. If you -were using the rdiff-backup handler, read the following section -carefully. Other handlers have not changed in any significant way. +now read several default values from the backupninja base class. The +$installkey parameter used in several handlers has been renamed to +$keymanage, to keep in line with the base class parameter. + +If you were using the rdiff-backup handler, you need to read the +following section carefully. Changes to the rdiff-backup handler ----------------------------------- diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index 058945d..cf57239 100644 --- a/manifests/duplicity.pp +++ b/manifests/duplicity.pp @@ -94,7 +94,7 @@ define backupninja::duplicity( $order = 90, $backuptag = false, # key options $createkey = false, - $installkey = true ) { + $keymanage = $backupninja::keymanage ) { # install client dependencies ensure_resource('package', 'duplicity', {'ensure' => $backupninja::ensure_duplicity_version}) @@ -122,7 +122,7 @@ define backupninja::duplicity( $order = 90, user => $destuser, host => $desthost, createkey => $createkey, - installkey => $installkey, + keymanage => $keymanage, keytype => $backupkeytype, keystore => $backupkeystore, keystorefspath => $backupkeystorefspath, diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp index 74afa8c..9d01cf2 100644 --- a/manifests/rdiff.pp +++ b/manifests/rdiff.pp @@ -25,7 +25,7 @@ define backupninja::rdiff( $include = [ "/var/spool/cron/crontabs", "/var/backups", "/etc", "/root", "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ], $vsinclude = false, $keep = 30, $sshoptions = false, $options = '--force', $ssh_dir_manage = true, - $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false, + $ssh_dir = false, $authorized_keys_file = false, $installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false, $nagios_description = 'backups') { @@ -54,7 +54,7 @@ define backupninja::rdiff( backupninja::key { "${user}-${name}": user => $user, host => $host, - installkey => $installkey, + keymanage => $keymanage, keytype => $backupkeytype, keystore => $backupkeystore, } diff --git a/manifests/rsync.pp b/manifests/rsync.pp index 160fad7..046f3f4 100644 --- a/manifests/rsync.pp +++ b/manifests/rsync.pp @@ -5,7 +5,7 @@ define backupninja::rsync( $order = 90, $ensure = present, $user = false, $home = false, $host = false, $ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false, - $installuser = true, $installkey = true, $key = false, $backuptag = false, + $installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false, $home = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false, $nagios_description = 'backups', $subfolder = 'rsync', @@ -71,7 +71,7 @@ define backupninja::rsync( backupninja::key { "${user}-${name}": user => $user, host => $host, - installkey => $installkey, + keymanage => $keymanage, keytype => $backupkeytype, keystore => $backupkeystore, } |