X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.ssh%2Fconfig;h=46b547d7519c43830b1404bbd41966d93a4e1c3a;hb=e815297e3c97d8083afaef8345a8b2d711e69d06;hp=829bc3c3719f265b5c58249e9fbdb28d042e18c6;hpb=1e07399f5960e6b319ba71f7b3171538be7ce478;p=home-base.git

diff --git a/.ssh/config b/.ssh/config
index 829bc3c..46b547d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,95 +1,21 @@
-Host frogsleap.com
-  User frogsleap
-  IdentityFile ~/.ssh/identity_frogsleap
+Include ~/.ssh/host_specific_config
+Include ~/.ssh/config.d/*.conf
+# Debian general configuration
 Host *.debian.org
   IdentityFile ~/.ssh/identity_debian
   UserKnownHostsFile ~/.ssh/known_hosts_debian
-Host *.sndservers.com
-  IdentityFile ~/.ssh/identity_sndservers
-  UserKnownHostsFile ~/.ssh/known_hosts_sndservers
-# machines in the don bit
-Host ernst.ucr.edu
-  User zido
-  IdentityFile ~/.ssh/identity_don
-Host acif500.ucr.edu
-  User zido
-  IdentityFile ~/.ssh/identity_don
-Host volo
-  User don
-  HostKeyAlias volo
-  CheckHostIP no
-  IdentityFile ~/.ssh/identity_don
-Host zeto
-  User don
-  HostKeyAlias zeto
-  CheckHostIP no
-  IdentityFile ~/.ssh/identity_don
-# donarmstrong machines so I don't have to type them in
-Host archimedes.ucr.edu
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-Host rzlab.ucr.edu
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-Host spth1304.ucr.edu
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
+  VerifyHostKeyDNS yes
+# donarmstrong.com general configuration
 Host *.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
   IdentityFile ~/.ssh/identity_don
-Host crito.ucr.edu
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-# 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
-  User don
-  IdentityFile ~/.ssh/identity_culinarytrends
-Host tails.dreamhost.com
-  User don
-  IdentityFile ~/.ssh/identity_alanarmstrong
-Host *.kneedraggers.com
-  User don
-  IdentityFile ~/.ssh/identity_kneedraggers
-Host tijuana.com
-  User don
-  IdentityFile ~/.ssh/identity_castello
-Host daycare.com
-  User don
-  IdentityFile ~/.ssh/identity_castello
-Host *.ccin.com
-  User don
-  IdentityFile ~/.ssh/identity_castello
-  UserKnownHostsFile ~/.ssh/known_hosts_castello
-Host *.excelwholesale.com
-  User don
-  IdentityFile ~/.ssh/identity_excelwholesale
+  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
+