X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=2d179de877109b8b9f2b510b827876bb418eb6fe;hb=23b3472027a552a8d691d19cdfb60a521f027955;hp=6cf1f9cc17de05af3f2b9a677445eb51f2818dce;hpb=94041dfa18dc71762e6642f55115953cb61f9cc5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 6cf1f9cc1..2d179de87 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,6 +75,10 @@ AcceptEnv LANG LC_*
 Subsystem sftp /usr/lib/openssh/sftp-server
 
 UsePAM yes
+<% 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
+<% end %>
 PasswordAuthentication no