X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=93b39c5f374f617bb8afd3bf1aff0a45c0eb0bc7;hb=a90fedb8cef5b26fdae6218bce5b599d39db8a0e;hp=6cf1f9cc17de05af3f2b9a677445eb51f2818dce;hpb=94041dfa18dc71762e6642f55115953cb61f9cc5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 6cf1f9cc1..93b39c5f3 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -76,6 +76,10 @@ AcceptEnv LANG LC_*
 Subsystem sftp /usr/lib/openssh/sftp-server
 
 UsePAM yes
+<% 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