probably break a couple of release dependent templates

[dsa-puppet.git] / modules / ssh / templates / sshd_config.erb

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 0bc6efb7d6b5c0461a0b538cdd55cdc38ecbde97..93b39c5f374f617bb8afd3bf1aff0a45c0eb0bc7 100644 (file)
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -76,10 +76,10 @@ AcceptEnv LANG LC_*
 Subsystem sftp /usr/lib/openssh/sftp-server
 
 UsePAM yes
-<% if nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'] %>
-AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u
-<% else %>
+<% if %w{lenny squeeze}.include?(lsbdistcodename) %>
 AuthorizedKeysFile /etc/ssh/userkeys/%u
 AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
+<% else %>
+AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u
 <% end %>
 PasswordAuthentication no