aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-08 12:43:30 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-08 12:43:30 -0400
commit1ad3b20e21480e39ab4f032834cc2357b290f78c (patch)
tree57ead51906934fdaf54151ca15c110a3c4cba191 /manifests
parente4bcc14b1a21395d4f32e940db1af37ab2c9e385 (diff)
downloadpuppet-backupninja-1ad3b20e21480e39ab4f032834cc2357b290f78c.tar.gz
puppet-backupninja-1ad3b20e21480e39ab4f032834cc2357b290f78c.tar.bz2
Adjust $home default value of the rsync handler, removes $real_home
Diffstat (limited to 'manifests')
-rw-r--r--manifests/rsync.pp13
1 files changed, 4 insertions, 9 deletions
diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 4296ce0..8fbe639 100644
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -3,10 +3,10 @@
define backupninja::rsync(
$order = 90, $ensure = present,
- $user = false, $home = false, $host = false,
+ $user = false, $home = "/home/${user}-${name}", $host = false,
$ssh_dir_manage = true, $ssh_dir = false, $authorized_keys_file = false,
$installuser = true, $keymanage = $backupninja::keymanage, $key = false, $backuptag = false,
- $home = false, $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false,
+ $backupkeytype = $backupninja::keytype, $backupkeystore = $backupninja::keystore, $extras = false,
$nagios_description = 'backups', $subfolder = 'rsync',
$log = false, $partition = false, $fscheck = false, $read_only = false,
@@ -46,17 +46,12 @@ define backupninja::rsync(
default => $backuptag,
}
- $real_home = $home ? {
- false => "/home/${user}-${name}",
- default => $home,
- }
-
- $directory = "${real_home}/${subfolder}/"
+ $directory = "${home}/${subfolder}/"
backupninja::server::sandbox { "${user}-${name}":
user => $user,
host => $host,
- dir => $real_home,
+ dir => $home,
manage_ssh_dir => $ssh_dir_manage,
ssh_dir => $ssh_dir,
key => $key,