X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=7821514615b1f8b0afc7eb5459de9caedc981ce7;hb=98a0aa027db8cdada21f6896ae0c08ba8e1530aa;hp=0f8657ae7ba7fffba0ba92f12fc319b2e40279c7;hpb=7bf7eb707f3693636bc5799ce801e2e60b60046e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 0f8657ae7..782151461 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -75,10 +75,10 @@ AcceptEnv LANG LC_*
 Subsystem sftp /usr/lib/openssh/sftp-server
 
 UsePAM yes
-<% if %w{lenny squeeze}.include?(lsbdistcodename) %>
+<% if %w{squeeze}.include?(scope.lookupvar('::lsbdistcodename')) %>
 AuthorizedKeysFile /etc/ssh/userkeys/%u
 AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
 <% else %>
-AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u
+AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
 <% end %>
 PasswordAuthentication no