diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-23 23:17:48 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-23 23:17:48 +0000 |
| commit | d4a4c17d256855d350f87cb511136cf6e00cb726 (patch) | |
| tree | 28680f2dedd63199896a663a241bb2c41cb87bf2 /modules/openssh/templates | |
| parent | 0b64c47717c4483cc519e0f739bf0d4972f2277a (diff) | |
| download | puppet-d4a4c17d256855d350f87cb511136cf6e00cb726.tar puppet-d4a4c17d256855d350f87cb511136cf6e00cb726.tar.gz puppet-d4a4c17d256855d350f87cb511136cf6e00cb726.tar.bz2 puppet-d4a4c17d256855d350f87cb511136cf6e00cb726.tar.xz puppet-d4a4c17d256855d350f87cb511136cf6e00cb726.zip | |
the previous trick didn't work as tags are dependent in the order of
declaration ( and that's bad (tm) ). This one is safer.
Diffstat (limited to 'modules/openssh/templates')
| -rw-r--r-- | modules/openssh/templates/sshd_config | 4 | ||||
| -rw-r--r-- | modules/openssh/templates/sshd_config_ldap | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/openssh/templates/sshd_config b/modules/openssh/templates/sshd_config index d3f776e1..f478e0e4 100644 --- a/modules/openssh/templates/sshd_config +++ b/modules/openssh/templates/sshd_config @@ -45,10 +45,6 @@ PermitRootLogin without-password #PubkeyAuthentication yes #AuthorizedKeysFile .ssh/authorized_keys -<% if all_tags.include?('openssh::ssh_keys_from_ldap') %> -AuthorizedKeysFile /var/lib/config/pubkeys/%u/authorized_keys -<% end %> - # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts #RhostsRSAAuthentication no diff --git a/modules/openssh/templates/sshd_config_ldap b/modules/openssh/templates/sshd_config_ldap new file mode 100644 index 00000000..1291c8fe --- /dev/null +++ b/modules/openssh/templates/sshd_config_ldap @@ -0,0 +1,3 @@ + +AuthorizedKeysFile /var/lib/config/pubkeys/%u/authorized_keys + |