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

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 93b39c5f3..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 %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