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

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 0bc6efb7d..782151461 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -5,7 +5,6 @@
 Port 22
 <%= extraports = case fqdn
                         when "ravel.debian.org" then "Port 443"
-                        when "agnesi.debian.org" then "Port 2260"
                  end
 extraports
 %>
@@ -76,10 +75,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{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 /etc/ssh/userkeys/%u.more
 <% end %>
 PasswordAuthentication no