maybe this?

[mirror/dsa-puppet.git] / modules / ssh / templates / sshd_config.erb

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 840a7f8..2d179de 100644 (file)
--- 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{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