X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=0f8657ae7ba7fffba0ba92f12fc319b2e40279c7;hb=ae040bee3562b2253cf41ac45e3ea59f031ee53f;hp=840a7f87cd99de05ec02949fdb77d87873bb0d40;hpb=b233cbf36fe50a47edd458cc29b8ba9806273e2c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 840a7f87c..0f8657ae7 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -3,10 +3,8 @@
 
 # What ports, IPs and protocols we listen for
 Port 22
-<%- extraports = case fqdn
+<%= extraports = case fqdn
                         when "ravel.debian.org" then "Port 443"
-                        when "gluck.debian.org" then "Port 443"
-                        when "agnesi.debian.org" then "Port 2260"
                  end
 extraports
 %>
@@ -77,6 +75,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