X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssh%2Ftemplates%2Fssh_config.erb;h=e132a202b08b315dcddf115e357d79be91b597ef;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=1ae92b5cc03aded80ef9a3b63be42ef1a75c9a68;hpb=4787bbcdefd4b94330746589d40808d5ce02ff9e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssh/templates/ssh_config.erb b/modules/ssh/templates/ssh_config.erb
index 1ae92b5cc..e132a202b 100644
--- a/modules/ssh/templates/ssh_config.erb
+++ b/modules/ssh/templates/ssh_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
+##
+
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
 # users, and the values can be changed in per-user configuration files
@@ -49,3 +54,11 @@ Host *
     GSSAPIAuthentication no
     GSSAPIDelegateCredentials no
     VerifyHostKeyDNS yes
+<%- if (@hostname == "sibelius") -%>
+    ServerAliveInterval 450
+<%- end -%>
+# Used for the email-virtualdomains setup
+Host mail-git
+    Hostname adayevskaya.debian.org
+    User git
+    IdentityFile /etc/ssh/ssh_host_rsa_key