aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-07-31 15:33:19 +0000
committerMicah Anderson <micah@riseup.net>2008-07-31 15:33:19 +0000
commit93b370beb1c13d9d6f99d66526e68d54ed79add8 (patch)
tree51ced9d4541558fd2153839529304c2ab353eb1e
parentd6f0ce445f1e44fcdd68e3dffbc9250b9df4ba86 (diff)
downloadpuppet-backupninja-93b370beb1c13d9d6f99d66526e68d54ed79add8.tar.gz
puppet-backupninja-93b370beb1c13d9d6f99d66526e68d54ed79add8.tar.bz2
allow for a resource override of managing the ssh directory
-rw-r--r--manifests/client.pp4
-rw-r--r--manifests/rdiff.pp4
2 files changed, 6 insertions, 2 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index 6f48b22..c9193c9 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -27,6 +27,10 @@ class backupninja::client {
'' => true,
default => $keymanage
}
+ $real_ssh_dir_manage = $ssh_dir_manage ? {
+ '' => true,
+ default => $ssh_dir_manage
+ }
package { 'backupninja':
ensure => '0.9.5-3';
}
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index d015d6d..e3964d0 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -23,7 +23,7 @@ define backupninja::rdiff(
"/home/*/gtk-gnutella-downloads" ],
$include = [ "/var/spool/cron/crontabs", "/var/backups", "/etc", "/root",
"/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
- $vsinclude = false, $keep = 30, $sshoptions = false, $options = false, $manage_ssh_dir = true,
+ $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)
{
@@ -35,7 +35,7 @@ define backupninja::rdiff(
backupninja::server::sandbox
{
"${user}-${name}": user => $user, host => $host, dir => $directory,
- manage_ssh_dir => $manage_ssh_dir, ssh_dir => $ssh_dir,
+ manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir,
authorized_keys_file => $authorized_keys_file, installuser => $installuser,
backuptag => $backuptag
}