X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fssh%2Ftemplates%2Fsshd_config.erb;h=9cf0eb87b64af5d1bc2a7afb0a37d92e905db2c5;hb=f744f4e667b812821f3b36dcc9f191828e3d71e3;hp=2d179de877109b8b9f2b510b827876bb418eb6fe;hpb=103e56b48752f77fd66edd1824d82946570ca033;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 2d179de87..9cf0eb87b 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -1,3 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 # Package generated configuration file
 # See the sshd(8) manpage for details
 
@@ -5,6 +10,12 @@
 Port 22
 <%= extraports = case fqdn
                         when "ravel.debian.org" then "Port 443"
+                        when "paradis.debian.org" then "
+ListenAddress 0.0.0.0:22
+ListenAddress [::]:22
+ListenAddress 5.153.231.31:443
+ListenAddress [2001:41c8:1000:21::21:31]:443
+"
                  end
 extraports
 %>
@@ -79,6 +90,6 @@ UsePAM yes
 AuthorizedKeysFile /etc/ssh/userkeys/%u
 AuthorizedKeysFile2 /var/lib/misc/userkeys/%u
 <% else %>
-AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u
+AuthorizedKeysFile /etc/ssh/userkeys/%u /var/lib/misc/userkeys/%u /etc/ssh/userkeys/%u.more
 <% end %>
 PasswordAuthentication no