diff options
| author | Michael Scherer <misc@mageia.org> | 2011-06-08 15:25:45 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-06-08 15:25:45 +0000 |
| commit | 39a0491e3e152d25490496fe56a61ed14a0cd8f8 (patch) | |
| tree | 9f478bbf9d63cf549269c8d8c7a12f8cf9be5925 /modules/openssh | |
| parent | 0251d56d865061618e33204dd47ef4790e67d71a (diff) | |
| download | puppet-39a0491e3e152d25490496fe56a61ed14a0cd8f8.tar puppet-39a0491e3e152d25490496fe56a61ed14a0cd8f8.tar.gz puppet-39a0491e3e152d25490496fe56a61ed14a0cd8f8.tar.bz2 puppet-39a0491e3e152d25490496fe56a61ed14a0cd8f8.tar.xz puppet-39a0491e3e152d25490496fe56a61ed14a0cd8f8.zip | |
use a define to avoid array flattening by puppet
Diffstat (limited to 'modules/openssh')
| -rw-r--r-- | modules/openssh/manifests/init.pp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/modules/openssh/manifests/init.pp b/modules/openssh/manifests/init.pp index e36f14e9..2e3fa3ae 100644 --- a/modules/openssh/manifests/init.pp +++ b/modules/openssh/manifests/init.pp @@ -58,19 +58,22 @@ class openssh { mode => 700, } - if $symlink_users { - file { "$pubkeys_directory/$symlink_users": - ensure => directory, - owner => $symlink_users, - group => $symlink_users, - mode => 700, - } + define symlink_user() { + file { "$pubkeys_directory/$name": + ensure => directory, + owner => $name, + group => $name, + mode => 700, + } + + file { "$pubkeys_directory/$name/authorized_keys": + ensure => "~$name/.ssh/authorized_keys", + mode => 700, + } + } + + symlink_user { $symlink_users: } - file { "$pubkeys_directory/$symlink_users/authorized_keys": - ensure => "/home/$symlink_users/.ssh/authorized_keys", - mode => 700, - } - } $sshkey2file = "/usr/local/bin/ldap-sshkey2file.py" $ldap_pwfile = "/etc/ldap.secret" |