diff options
| author | Micah Anderson <micah@riseup.net> | 2009-08-27 15:26:09 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-08-27 15:26:09 -0400 |
| commit | dae31bd0aa6cb47122b080acaee584e7df354da3 (patch) | |
| tree | d622d29780b1c715670acbd309d04d95bf186771 /manifests/server.pp | |
| parent | 0b9d05cf596fab6b8fe4b03e21e6f8cb802238fe (diff) | |
| parent | 73c59d37ff9f35abf4307fd243e4ed5ec9e78d97 (diff) | |
Merge commit '73c59d37ff9f35abf4307fd243e4ed5ec9e78d97'
Diffstat (limited to 'manifests/server.pp')
| -rw-r--r-- | manifests/server.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index 162d889..213022b 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -30,8 +30,8 @@ class backupninja::server { # get created on the server define sandbox( $user = false, $host = false, $installuser = true, $dir = false, $manage_ssh_dir = true, - $ssh_dir = false, $authorized_keys_file = false, $backupkeys = false, $uid = false, - $gid = "backupninjas", $backuptag = false) + $ssh_dir = false, $authorized_keys_file = false, $backupkeys = false, $keytype = "rsa", + $uid = false, $gid = "backupninjas", $backuptag = false) { $real_user = $name ? { @@ -84,7 +84,7 @@ class backupninja::server { @@file { "${real_ssh_dir}/${real_authorized_keys_file}": ensure => present, mode => 0644, owner => 0, group => 0, - source => "$real_backupkeys/${user}_id_rsa.pub", + source => "$real_backupkeys/${user}_id_${keytype}.pub", require => File["${real_ssh_dir}"], tag => "$real_backuptag", } |