Fix default value of $ssh_dir variable in server sandbox

diff --git a/manifests/server.pp b/manifests/server.pp
index 6346a62a57af6d663b4e376be241597d12e34e74..d73df1f98da2bccdf5310e23aaaffcb394ec2c5a 100644 (file)
--- 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: }