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

diff --git a/.ssh/config b/.ssh/config
index e058c79..46b547d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,120 +1,21 @@
-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;'
+Include ~/.ssh/host_specific_config
+Include ~/.ssh/config.d/*.conf
+# Debian general configuration
 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
-  IdentityFile ~/.ssh/identity_don
-Host volo
-  User don
-  HostKeyAlias volo
-  CheckHostIP no
-  IdentityFile ~/.ssh/identity_don
-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 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
-  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
+  VerifyHostKeyDNS yes
+# donarmstrong.com general configuration
 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
-  IdentityFile ~/.ssh/identity_don
-# Propel consulting machinges
-Host 172.16.0.59
-  IdentityFile ~/.ssh/identity_propel
-Host xen.propel.com
-  IdentityFile ~/.ssh/identity_propel
-Host scs.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host pacific.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host builder.lab.propel.com
-  User don
-  IdentityFile ~/.ssh/identity_propel
-Host debianarchive.lab.propel.com
-  User don
-  IdentityFile ~/.ssh/identity_propel
-Host *.lab.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host *.abaca.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
-Host blogamundo.com
-  User don
-  IdentityFile ~/.ssh/identity_blogamundo
-Host culinarytrends.net
-  User don
-  IdentityFile ~/.ssh/identity_culinarytrends
-Host alanarmstrong.com
-  User don
-  IdentityFile ~/.ssh/identity_alanarmstrong
-Host *.kneedraggers.com
-  User don
-  IdentityFile ~/.ssh/identity_kneedraggers
-Host tijuana.com
-  User don
-  IdentityFile ~/.ssh/identity_castello
-Host daycare.com
-  User don
-  IdentityFile ~/.ssh/identity_castello
-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
+  ServerAliveInterval 300
 
 # This has to go at the bottom, because it doesn't get overridden
 # otherwise.
 Host *
   ControlMaster auto
   ControlPath ~/tmp/%h_%p_%r
+  ControlPersist 120
+