X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.ssh%2Fconfig;h=997ba77da1314aacc2404c3051cb387b6aea6081;hp=108e32234857adad28a0a603c21e9a5b3a4e8eea;hb=198411a0afe3bef3ba9bdc3c0db516e00a90b593;hpb=6750163f90fd72f457afa5c59784118d9852e82a

diff --git a/.ssh/config b/.ssh/config
index 108e322..997ba77 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,15 +1,32 @@
-ControlMaster auto
-ControlPath ~/tmp/%h_%p_%r
 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 cvs.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
+Host teco-ilo.lab.donarmstrong.com uval-ilo.lab.donarmstrong.com
+  IdentityFile ~/.ssh/id_ilo
+  UserKnownHostsFile ~/.ssh/known_hosts_ilo
+  ForwardAgent no
+Host *-ilo.lab.donarmstrong.com !teco-ilo.lab.donarmstrong.com !uval-ilo.lab.donarmstrong.com
+  IdentityFile ~/.ssh/id_ilo
+  UserKnownHostsFile ~/.ssh/known_hosts_ilo
+  ForwardAgent no
+  KexAlgorithms diffie-hellman-group1-sha1
+  PreferredAuthentications keyboard-interactive,password
+  HostkeyAlgorithms ssh-rsa
+  SendEnv
+Host charlie delta *.sndservers.com *.*.prometheuslabor.com *.prometheuslabor.com
   IdentityFile ~/.ssh/identity_sndservers
   UserKnownHostsFile ~/.ssh/known_hosts_sndservers
 # machines in the don bit
@@ -19,33 +36,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
-Host rzlab3.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 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
@@ -54,6 +76,10 @@ Host crito.ucr.edu
   User don
   UserKnownHostsFile ~/.ssh/known_hosts_don
   IdentityFile ~/.ssh/identity_don
+Host hemlock.ucr.edu
+  User don
+  UserKnownHostsFile ~/.ssh/known_hosts_don
+  IdentityFile ~/.ssh/identity_don
 # Propel consulting machinges
 Host 172.16.0.59
   IdentityFile ~/.ssh/identity_propel
@@ -99,10 +125,15 @@ Host *.ccin.com
   User don
   IdentityFile ~/.ssh/identity_castello
   UserKnownHostsFile ~/.ssh/known_hosts_castello
-Host *.excelwholesale.com
-Host lists.abcnrates.com
+Host *.excelwholesale.com 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