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

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 840a7f87c..93b39c5f3 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -3,9 +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 +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