aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-08-29 13:18:54 -0300
committerSilvio Rhatto <rhatto@riseup.net>2009-08-29 13:18:54 -0300
commit70cae2f75b1938ac26a75597a8e75dc3e7d327b7 (patch)
treeda429c25afeac183d24da75380dfe0b9653eaa9a /manifests
parentc823b2865bfc5ce19e91afda2572e1f66d5613e3 (diff)
downloadpuppet-backupninja-70cae2f75b1938ac26a75597a8e75dc3e7d327b7.tar.gz
puppet-backupninja-70cae2f75b1938ac26a75597a8e75dc3e7d327b7.tar.bz2
Adding missing keystore and backupkeystore parameters at rdiff and dup definitions
Diffstat (limited to 'manifests')
-rw-r--r--manifests/dup.pp1
-rw-r--r--manifests/rdiff.pp5
2 files changed, 4 insertions, 2 deletions
diff --git a/manifests/dup.pp b/manifests/dup.pp
index 6e0330a..dc597f7 100644
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -116,6 +116,7 @@ define backupninja::duplicity( $order = 90,
host => $desthost,
installkey => $installkey,
keytype => $backupkeytype,
+ keystore => $backupkeystore,
}
# the backupninja rule for this duplicity backup
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index f810357..b32a262 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -25,7 +25,7 @@ define backupninja::rdiff(
"/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
$vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $ssh_dir_manage = true,
$ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true,
- $backuptag = false, $home = false, $backupkeytype = "rsa")
+ $backuptag = false, $home = false, $backupkeytype = "rsa", $backupkeystore = false)
{
include backupninja::client::defaults
@@ -45,7 +45,7 @@ define backupninja::rdiff(
"${user}-${name}": user => $user, host => $host, dir => $real_home,
manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
authorized_keys_file => $authorized_keys_file, installuser => $installuser,
- backuptag => $backuptag, keytype => $backupkeytype,
+ backuptag => $backuptag, keytype => $backupkeytype, backupkeys => $backupkeystore,
}
backupninja::client::key
@@ -53,6 +53,7 @@ define backupninja::rdiff(
"${user}-${name}": user => $user, host => $host,
installkey => $installkey,
keytype => $backupkeytype,
+ keystore => $backupkeystore,
}
}
}