tweak control paths as required

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

diff --git a/.ssh/config b/.ssh/config
index 829bc3c3719f265b5c58249e9fbdb28d042e18c6..bc7a4fea7e2a912ffe619669b417f7dbe471c97e 100644 (file)
--- 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
@@ -91,5 +102,15 @@ Host *.ccin.com
   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