aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Beaupre <anarcat@koumbit.org>2009-01-06 16:49:02 -0500
committerAntoine Beaupre <anarcat@koumbit.org>2009-01-06 16:49:02 -0500
commitb27f528d43b40105af2e34d066d2f54c5e6a1dcb (patch)
tree1b3531a047b0d0dbcfb0f1bf7986e29fdd28efb4
parentf1b2351569d450a15c06529ec3dcfbaca8365e33 (diff)
downloadpuppet-backupninja-b27f528d43b40105af2e34d066d2f54c5e6a1dcb.tar.gz
puppet-backupninja-b27f528d43b40105af2e34d066d2f54c5e6a1dcb.tar.bz2
send the fqdn, not the specified host, to the sandbox so that it knows for which host it's being configured
-rw-r--r--manifests/rdiff.pp9
1 files changed, 7 insertions, 2 deletions
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 4abc9b2..0228a06 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -27,6 +27,11 @@ define backupninja::rdiff(
$ssh_dir = false, $authorized_keys_file = false, $installuser = true, $installkey = true, $key = false,
$backuptag = false)
{
+ $real_backuptag = $backuptag ? {
+ false => $host,
+ default => $backuptag
+ }
+
$directory = "$home/rdiff-backup/"
include backupninja::client
case $type {
@@ -35,10 +40,10 @@ define backupninja::rdiff(
backupninja::server::sandbox
{
- "${user}-${name}": user => $user, host => $host, dir => $home,
+ "${user}-${name}": user => $user, host => $fqdn, dir => $home,
manage_ssh_dir => $ssh_dir_manage, ssh_dir => $ssh_dir, key => $key,
authorized_keys_file => $authorized_keys_file, installuser => $installuser,
- backuptag => $backuptag
+ backuptag => $real_backuptag
}
backupninja::client::key