aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Beaupre <anarcat@koumbit.org>2009-01-14 22:42:50 -0500
committerAntoine Beaupre <anarcat@koumbit.org>2009-01-14 22:42:50 -0500
commitf6cdb278a75088a38b18a565563e7900321b925b (patch)
tree659c79d50310b7194ff5606083f73fe8e7e707f4
parentb6bf47ef89024ae39f9fe25370554c4ea46914bb (diff)
downloadpuppet-backupninja-f6cdb278a75088a38b18a565563e7900321b925b.tar.gz
puppet-backupninja-f6cdb278a75088a38b18a565563e7900321b925b.tar.bz2
revert part of last commit: the backuptag is really based on the host provided to the rdiff command and the host provided to the sandbox is the fqdn of the server
-rw-r--r--manifests/rdiff.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index ee99821..0228a06 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -28,7 +28,7 @@ define backupninja::rdiff(
$backuptag = false)
{
$real_backuptag = $backuptag ? {
- false => $fqdn,
+ false => $host,
default => $backuptag
}
@@ -40,7 +40,7 @@ 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 => $real_backuptag