From: Stephen Gran <steve@lobefin.net>
Date: Sun, 2 Aug 2009 00:36:04 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=94041dfa18dc71762e6642f55115953cb61f9cc5;p=mirror%2Fdsa-puppet.git

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

94041dfa18dc71762e6642f55115953cb61f9cc5
diff --cc modules/ssh/templates/sshd_config.erb
index 90bc532b6,51356af88..6cf1f9cc1
--- a/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