X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.ssh%2Fconfig;h=e058c79f7197e5a283b3e30443c90d8e73cb0d27;hp=f304fd28f12825499dbe5f72629117ebdf3ecf08;hb=3d1de2ab9e5d962342095f6dcfb3aee7cc23e4cd;hpb=ed2d3101e1b70d7a62c750b0668e95a368ef9b8e

diff --git a/.ssh/config b/.ssh/config
index f304fd2..e058c79 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,45 +1,65 @@
+Host frogsleap.com
+  User frogsleap
+  IdentityFile ~/.ssh/identity_frogsleap
+Host rietz.debian.org
+  IdentityFile ~/.ssh/identity_debian
+  UserKnownHostsFile ~/.ssh/known_hosts_debian
+  ProxyCommand sh -c 'if [ $(hostname) == "archimedes" ]; then nc rietz.debian.org 22 2>/dev/null; else ssh archimedes.ucr.edu nc rietz.debian.org 22 2>/dev/null; fi;'
+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
+# machines in the don bit
 Host ernst.ucr.edu
   User zido
+  IdentityFile ~/.ssh/identity_don
 Host acif500.ucr.edu
   User zido
-Host ralph.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
-Host frogsleap.com
-  User frogsleap
-Host *.debian.org
-  IdentityFile ~/.ssh/identity_debian
-  UserKnownHostsFile ~/.ssh/known_hosts_debian
-Host *.sndservers.com
-  IdentityFile ~/.ssh/identity_sndservers
-  UserKnownHostsFile ~/.ssh/known_hosts_sndservers
+  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
+  ControlPath ~/tmp/archimedes_%p_%r
+Host rzlab3.ucr.edu dn-rzlab3.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
-Host rzlab.ucr.edu
+  IdentityFile ~/.ssh/identity_don
+  ControlPath ~/tmp/rzlab3_%p_%r
+Host rzlab.ucr.edu dn-rzlab.donarmstrong.com svn.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
-Host spth1304.ucr.edu
+  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
+  IdentityFile ~/.ssh/identity_don
 Host crito.ucr.edu
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
-Host *.debconf.org
-  IdentityFile ~/.ssh/identity_debconf
-Host comas.linux-aktivaattori.org
-  IdentityFile ~/.ssh/identity_debconf
+  IdentityFile ~/.ssh/identity_don
 # Propel consulting machinges
 Host 172.16.0.59
   IdentityFile ~/.ssh/identity_propel
@@ -69,7 +89,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
@@ -84,6 +104,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