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

diff --git a/.ssh/config b/.ssh/config
index b543aa5..d4411ad 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,9 +1,22 @@
 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 exec nc -q 1:0 rietz.debian.org 22 2>/dev/null; else exec ssh archimedes.ucr.edu nc -q 1:0 rietz.debian.org 22 2>/dev/null; fi;'
+Host busoni.debian.org
+  IdentityFile ~/.ssh/identity_debian
+  UserKnownHostsFile ~/.ssh/known_hosts_debian
+  ProxyCommand sh -c 'if [ "$(hostname)" = "archimedes" ]; then exec nc -q 1:0 busoni.debian.org 22 2>/dev/null; else exec ssh archimedes.ucr.edu nc -q 1:0 busoni.debian.org 22 2>/dev/null; fi;'
+Host vasks.debian.org git.debian.org svn.debian.org
+  ControlPath ~/tmp/vasks.debian.org_%p_%r
 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
@@ -14,29 +27,38 @@ Host ernst.ucr.edu
 Host acif500.ucr.edu
   User zido
   IdentityFile ~/.ssh/identity_don
-Host volo
+Host volo dn-volo.donarmstrong.com
   User don
   HostKeyAlias volo
   CheckHostIP no
   IdentityFile ~/.ssh/identity_don
+  ControlPath ~/tmp/volo_%p_%r
 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
+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
   IdentityFile ~/.ssh/identity_don
-Host rzlab.ucr.edu
+  ControlPath ~/tmp/rzlab3_%p_%r
+Host rzlab.ucr.edu dn-rzlab.donarmstrong.com svn.donarmstrong.com git.donarmstrong.com
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
   IdentityFile ~/.ssh/identity_don
-Host spth1304.ucr.edu
+  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 +96,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 +111,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