aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-07 16:43:38 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-07 16:57:22 -0400
commit4637cf2b9d93606a05caeaf1fe5640b1161042ab (patch)
treeb5ddbf5062116e02b6224542bfdc4a240b3a8e09 /manifests
parente465032ecc82979ae8e4dce074970cb03273fe7d (diff)
downloadpuppet-backupninja-4637cf2b9d93606a05caeaf1fe5640b1161042ab.tar.gz
puppet-backupninja-4637cf2b9d93606a05caeaf1fe5640b1161042ab.tar.bz2
Renamed $installkey parameter to $keymanage, see upgrade notice in README
Diffstat (limited to 'manifests')
-rw-r--r--manifests/duplicity.pp4
-rw-r--r--manifests/rdiff.pp4
-rw-r--r--manifests/rsync.pp4
3 files changed, 6 insertions, 6 deletions
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,
}