X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/a2cba0425ed071aea9dbff1319942a05326c1084..ec4f7447c6e64015181939ab241d3a56ff8cff0b:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 1c02180..7278a7a 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -14,6 +14,10 @@ Host charade-vnc
   ControlPath none
   Hostname charade.madduck.net
 
+Host emily.madduck.net | emily
+  ForwardAgent yes
+  Hostname emily.madduck.net
+
 Host matilda.madduck.net | matilda
   ForwardAgent yes
   Hostname matilda.madduck.net
@@ -22,6 +26,10 @@ Host vizier.madduck.net | vizier
   ForwardAgent yes
   Hostname vizier.madduck.net
 
+Host ambassador.madduck.net | ambassador
+  ForwardAgent yes
+  Hostname ambassador.madduck.net
+
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
@@ -58,10 +66,6 @@ Host jugband.madduck.net | jugband
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
-Host irc
-  User madduck
-  Hostname domine.madduck.net
-  ConnectTimeout 60
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
@@ -132,12 +136,18 @@ Host swan-host | swan-host.madduck.net
 Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
-
 ### ARNOLD / GPLHOST
 
+Host arnold.madduck.net | arnold
+  ForwardAgent yes
+  Hostname arnold.madduck.net
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
   User xen05
+Host irc
+  User madduck
+  Hostname arnold.madduck.net
+  ConnectTimeout 60
 
 ### GERN
 
@@ -157,10 +167,14 @@ Host juliae
   ForwardX11 yes
   HostKeyAlias julia.gern.madduck.net
 
+Host git.gern.madduck.net | git.gern
+  ForwardAgent yes
+  HostKeyAlias julia.gern.madduck.net
+
 Host fishbowl.gern.madduck.net | fishbowl.gern
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias fishbowl.gern
+  HostKeyAlias fishbowl
 
 Host galaxy-s2.phones.gern | galaxy-s2
   Hostname galaxy-s2.phones.gern
@@ -199,7 +213,7 @@ Host albatrosse
 Host fishbowl.lehel.madduck.net | fishbowl.lehel
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias fishbowl.lehel
+  HostKeyAlias fishbowl
 
 ### GAUTING
 
@@ -287,7 +301,7 @@ Host ancina.debian.org | ancina
 Host antheil.debian.org | antheil
   Hostname antheil.debian.org
   User madduck
-Host arnold.debian.org | arnold
+Host arnold.debian.org
   Hostname arnold.debian.org
   User madduck
 Host asdfasdf.debian.net | asdfasdf
@@ -849,6 +863,10 @@ Host zemlinsky.debian.org | zemlinsky
   Hostname zemlinsky.debian.org
   User madduck
 
+Host nelson.debconf.org | penta.debconf.org | nelson | summit
+  Hostname nelson.debconf.org
+  ProxyCommand ssh people.debian.org nc -q0 %h %p
+
 ### NZ
 
 Host workbuffer.org | nz
@@ -876,7 +894,7 @@ Host *
   ConnectTimeout 10
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
-  ControlPersist 5
+  ControlPersist 30
 ## DSAAuthentication no
 # DynamicForward off
 # EnableSSHKeysign no