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

diff --git a/.ssh/config.in b/.ssh/config.in
index 1c02180..5a8271e 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -157,10 +157,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 +203,7 @@ Host albatrosse
 Host fishbowl.lehel.madduck.net | fishbowl.lehel
   ForwardAgent yes
   ForwardX11 yes
-  HostKeyAlias fishbowl.lehel
+  HostKeyAlias fishbowl
 
 ### GAUTING
 
@@ -849,6 +853,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 +884,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