aboutsummaryrefslogtreecommitdiff
path: root/manifests/server.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-07-31 13:51:16 +0000
committerMicah Anderson <micah@riseup.net>2008-07-31 13:51:16 +0000
commit64172e7044f1e23904c11b4556bd44af2ac9836b (patch)
tree89272ed83351f3c0787117b5eb0c82983fdbb105 /manifests/server.pp
parentaa956a8199d72a5e4540361953f60ef57b40446d (diff)
downloadpuppet-backupninja-64172e7044f1e23904c11b4556bd44af2ac9836b.tar.gz
puppet-backupninja-64172e7044f1e23904c11b4556bd44af2ac9836b.tar.bz2
fix directory bug that was causing the home directory to be prepended to the beginning of the $sshdir
Diffstat (limited to 'manifests/server.pp')
-rw-r--r--manifests/server.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index c7b9cc1..39bb5c5 100644
--- 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",
}