Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --cc modules/ssh/templates/sshd_config.erb
index 90bc532,51356af..6cf1f9c
--- 1/modules/ssh/templates/sshd_config.erb
--- 2/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@@ -3,9 -3,8 +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