X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.ssh%2Fconfig;h=2143794fde02828566bf211accd4f9f17d3e678b;hp=3c728bc5ecd1962086ec6482fe07e3b90468a1a5;hb=4112de3045f5c3134c5468387a5d59854f44687f;hpb=53cfbaa7963ae94082659fb2ba1274dd6947736a

diff --git a/.ssh/config b/.ssh/config
index 3c728bc..2143794 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,36 +1,18 @@
-Host ernst.ucr.edu
-  User zido
-Host volo
-  User don
-  HostKeyAlias volo
-  CheckHostIP no
-Host frogsleap.com
-  User frogsleap
+Include ~/.ssh/host_specific_config
+# Debian general configuration
 Host *.debian.org
   IdentityFile ~/.ssh/identity_debian
-# 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 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 builder.lab.propel.com
-  User don
-  IdentityFile ~/.ssh/identity_propel
-Host debianarchive.lab.propel.com
+  UserKnownHostsFile ~/.ssh/known_hosts_debian
+# donarmstrong.com general configuration
+Host *.donarmstrong.com
   User don
-  IdentityFile ~/.ssh/identity_propel
-Host *.lab.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
+  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
+