include conf files in config.d directories

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

diff --git a/.ssh/config b/.ssh/config
index 0ad8c361a852524b90a300056076b0e367b63e10..46b547d7519c43830b1404bbd41966d93a4e1c3a 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,93 +1,21 @@
-Host bw.ncsa.illinois.edu
-  ServerAliveInterval 300
-Host moszumanska.debian.org git.debian.org svn.debian.org cvs.debian.org
-  ControlPath ~/tmp/moszumanska.debian.org_%p_%r
+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 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
-  Ciphers aes128-cbc,3des-cbc
-  MACs hmac-md5,hmac-sha1 
-  HostkeyAlgorithms ssh-rsa,ssh-dss
-  SendEnv
-Host charlie delta *.sndservers.com *.*.prometheuslabor.com *.prometheuslabor.com
-  IdentityFile ~/.ssh/identity_sndservers
-  UserKnownHostsFile ~/.ssh/known_hosts_sndservers
-# machines in the don bit
-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 dn-archimedes.donarmstrong.com
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-  ControlPath ~/tmp/archimedes_%p_%r
-  LocalForward localhost:9050  localhost:9050
-Host rzlab3.ucr.edu dn-rzlab3.donarmstrong.com
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-  ControlPath ~/tmp/rzlab3_%p_%rA
-Host linnode.donarmstrong.com git.donarmstrong.com linnode
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-  ControlPath ~/tmp/linnode.donarmstrong.com_%p_%r
-Host rzlab.ucr.edu dn-rzlab.donarmstrong.com svn.donarmstrong.com rzlab.int.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
-Host hemlock.ucr.edu
-  User don
-  UserKnownHostsFile ~/.ssh/known_hosts_don
-  IdentityFile ~/.ssh/identity_don
-Host alanarmstrong.com
-  User don
-  IdentityFile ~/.ssh/identity_alanarmstrong
-Host *.kneedraggers.com
-  User don
-  IdentityFile ~/.ssh/identity_kneedraggers
-Host *.excelwholesale.com 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
+