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

diff --git a/.ssh/config b/.ssh/config
index 291536a..46b547d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,29 +1,21 @@
-Host ernst.ucr.edu
-  User zido
-Host volo
-  User don
-  HostKeyAlias volo
-  CheckHostIP no
-Host frogsleap.com
-  User frogsleap
+Include ~/.ssh/host_specific_config
+Include ~/.ssh/config.d/*.conf
+# Debian general configuration
 Host *.debian.org
   IdentityFile ~/.ssh/identity_debian
-Host comas.linux-aktivaattori.org
-  IdentityFile ~/.ssh/identity_debconf
-# 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 builder.lab.propel.com
-  User don
-  IdentityFile ~/.ssh/identity_propel
-Host debianarchive.lab.propel.com
+  UserKnownHostsFile ~/.ssh/known_hosts_debian
+  VerifyHostKeyDNS yes
+# donarmstrong.com general configuration
+Host *.donarmstrong.com
   User don
-  IdentityFile ~/.ssh/identity_propel
-Host *.lab.propel.com
-  User darmstrong
-  IdentityFile ~/.ssh/identity_propel
+  UserKnownHostsFile ~/.ssh/known_hosts_don
+  IdentityFile ~/.ssh/identity_don
+  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
+