include conf files in config.d directories

[home-base.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 3dd1367e1267431e52716a17eec70d7dc22d0d13..46b547d7519c43830b1404bbd41966d93a4e1c3a 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,58 +1,21 @@
-Host ernst.ucr.edu
-  User zido
-Host ralph.ucr.edu
-  User zido
-Host volo
-  User don
-  HostKeyAlias volo
-  CheckHostIP no
-Host zeto
-  User don
-  HostKeyAlias zeto
-  CheckHostIP no
-Host frogsleap.com
-  User frogsleap
+Include ~/.ssh/host_specific_config
+Include ~/.ssh/config.d/*.conf
+# Debian general configuration
 Host *.debian.org
   IdentityFile ~/.ssh/identity_debian
-Host *.sndservers.com
-  IdentityFile ~/.ssh/identity_sndservers
-# donarmstrong machines so I don't have to type them in
-Host archimedes.ucr.edu
-Host rzlab.ucr.edu
-Host spth1304.ucr.edu
-Host svn.donarmstrong.com
-Host crito.ucr.edu
-  User don
-Host *.debconf.org
-  IdentityFile ~/.ssh/identity_debconf
-Host comas.linux-aktivaattori.org
-  IdentityFile ~/.ssh/identity_debconf
-# Propel consulting machinges
-Host 172.16.0.59
-  IdentityFile ~/.ssh/identity_propel
-Host xen.propel.com
-  IdentityFile ~/.ssh/identity_propel
-Host scs.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host pacific.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host builder.lab.propel.com
-  User don
-  IdentityFile ~/.ssh/identity_propel
-Host debianarchive.lab.propel.com
-  User don
-  IdentityFile ~/.ssh/identity_propel
-Host *.lab.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host *.abaca.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host blogamundo.com
-  User don
-  IdentityFile ~/.ssh/identity_blogamundo
-Host culinarytrends.net
+  UserKnownHostsFile ~/.ssh/known_hosts_debian
+  VerifyHostKeyDNS yes
+# donarmstrong.com general configuration
+Host *.donarmstrong.com
   User don
-  IdentityFile ~/.ssh/identity_culinarytrends
\ No newline at end of file
+  UserKnownHostsFile ~/.ssh/known_hosts_don
+  IdentityFile ~/.ssh/identity_don
+  ServerAliveInterval 300
+
+# This has to go at the bottom, because it doesn't get overridden
+# otherwise.
+Host *
+  ControlMaster auto
+  ControlPath ~/tmp/%h_%p_%r
+  ControlPersist 120
+