X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.ssh%2Fconfig;h=bc7a4fea7e2a912ffe619669b417f7dbe471c97e;hb=b811c87a017888727ca7fbba102a92fb2d67cf4e;hp=b543aa5baf15c9404466776be895dac27d4d5db7;hpb=defa525207ae870571552e9da562929a31231b4b;p=home-base.git

diff --git a/.ssh/config b/.ssh/config
index b543aa5..bc7a4fe 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,6 +4,9 @@ Host frogsleap.com
 Host *.debian.org
   IdentityFile ~/.ssh/identity_debian
   UserKnownHostsFile ~/.ssh/known_hosts_debian
+Host charlie
+Host delta
+Host *.prometheuslabor.com
 Host *.sndservers.com
   IdentityFile ~/.ssh/identity_sndservers
   UserKnownHostsFile ~/.ssh/known_hosts_sndservers
@@ -25,18 +28,26 @@ Host zeto
   CheckHostIP no
   IdentityFile ~/.ssh/identity_don
 # donarmstrong machines so I don't have to type them in
-Host archimedes.ucr.edu
+Host archimedes.ucr.edu dn-archimedes.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
   IdentityFile ~/.ssh/identity_don
-Host rzlab.ucr.edu
+  ControlPath ~/tmp/archimedes_%p_%r
+Host rzlab3.ucr.edu dn-rzlab3.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
   IdentityFile ~/.ssh/identity_don
-Host spth1304.ucr.edu
+  ControlPath ~/tmp/rzlab3_%p_%r
+Host rzlab.ucr.edu dn-rzlab.donarmstrong.com svn.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
   IdentityFile ~/.ssh/identity_don
+  ControlPath ~/tmp/rzlab_%p_%r
+Host spth1304.ucr.edu dn-spth1304.donarmstrong.com
+  User don
+  UserKnownHostsFile ~/.ssh/known_hosts_don
+  IdentityFile ~/.ssh/identity_don
+  ControlPath ~/tmp/spth1304.ucr.edu_%p_%r
 Host *.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
@@ -74,7 +85,7 @@ Host blogamundo.com
 Host culinarytrends.net
   User don
   IdentityFile ~/.ssh/identity_culinarytrends
-Host tails.dreamhost.com
+Host alanarmstrong.com
   User don
   IdentityFile ~/.ssh/identity_alanarmstrong
 Host *.kneedraggers.com
@@ -89,6 +100,17 @@ Host daycare.com
 Host *.ccin.com
   User don
   IdentityFile ~/.ssh/identity_castello
+  UserKnownHostsFile ~/.ssh/known_hosts_castello
 Host *.excelwholesale.com
+Host lists.acbnrates.com
   User don
   IdentityFile ~/.ssh/identity_excelwholesale
+Host debbugs.gnu.org
+  User don
+  IdentityFile ~/.ssh/identity_debbugs_gnu
+
+# This has to go at the bottom, because it doesn't get overridden
+# otherwise.
+Host *
+  ControlMaster auto
+  ControlPath ~/tmp/%h_%p_%r