fix directory bug that was causing the home directory to be prepended to the beginnin...

diff --git a/manifests/server.pp b/manifests/server.pp
index c7b9cc1e6736defb1bd92fd355d84f989d8d57c3..39bb5c553fd7486166ecc9d0c7280e33979736e7 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -52,7 +52,7 @@ class backupninja::server {
       default => $dir,
     }
     $real_ssh_dir = $ssh_dir ? {
-      false => ".ssh",
+      false => "${real_dir}/.ssh",
       default => $ssh_dir,
     }
     $real_authorized_keys_file = $authorized_keys_file ? {
@@ -71,17 +71,17 @@ class backupninja::server {
     }
     case $installuser {
       true: {
-        @@file { "${real_dir}/${real_ssh_dir}":
+        @@file { "${real_ssh_dir}":
           ensure => directory,
           mode => 700, owner => $user, group => 0,
           require => File["$real_dir"],
           tag => "$real_backuptag",
         }
-        @@file { "${real_dir}/${real_ssh_dir}/${real_authorized_keys_file}":
+        @@file { "${real_ssh_dir}/${real_authorized_keys_file}":
           ensure => present,
           mode => 644, owner => 0, group => 0,
           source => "$real_backupkeys/${user}_id_rsa.pub",
-          require => File["${real_dir}/${real_ssh_dir}"],
+          require => File["${real_ssh_dir}"],
           tag => "$real_backuptag",
         }