From ef59526bd21b4e95ab97159e9c728938ef80e15f Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 7 May 2015 16:53:04 -0400
Subject: Fix default value of $ssh_dir  variable in server sandbox

---
 manifests/server.pp | 6 +-----
 1 file changed, 1 insertion(+), 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: }
-- 
cgit v1.2.3