aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-07 16:53:04 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-05-07 16:57:46 -0400
commitef59526bd21b4e95ab97159e9c728938ef80e15f (patch)
tree9b460375b539ec94be1a41860156c59ba7fd5e3d
parentbde29cc21a400197bf4e4755ef0870aa3226d17d (diff)
downloadpuppet-backupninja-ef59526bd21b4e95ab97159e9c728938ef80e15f.tar.gz
puppet-backupninja-ef59526bd21b4e95ab97159e9c728938ef80e15f.tar.bz2
Fix default value of $ssh_dir variable in server sandbox
-rw-r--r--manifests/server.pp6
1 files changed, 1 insertions, 5 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index 6346a62..d73df1f 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -57,14 +57,10 @@ class backupninja::server (
# get created on the server
define sandbox(
$user = $name, $host = $::fqdn, $installuser = true, $dir = "${backupninja::server::backupdir}/${::fqdn}", $manage_ssh_dir = true,
- $ssh_dir = false, $authorized_keys_file = 'authorized_keys', $key = false, $keytype = 'dss', $backupkeys = "${fileserver}/keys/backupkeys", $uid = false,
+ $ssh_dir = "${backupninja::server::backupdir}/${::fqdn}/.ssh", $authorized_keys_file = 'authorized_keys', $key = false, $keytype = 'dss', $backupkeys = "${fileserver}/keys/backupkeys", $uid = false,
$gid = "backupninjas", $backuptag = "backupninja-${::fqdn}", $nagios_description = 'backups')
{
- if $ssh_dir == false {
- $ssh_dir = "${dir}/.ssh"
- }
-
if $manage_nagios {
# configure a passive service check for backups
nagios::service::passive { $nagios_description: }