X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/f012cec1363e4bff88834a3cefa9dc9056f6a6b1..67611ef7455a6392588d357440277dd2875e9b48:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 19860ee..5f883a5 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -17,6 +17,10 @@ Host charade-vnc
 Host matilda.madduck.net | matilda
   ForwardAgent yes
   Hostname matilda.madduck.net
+Host irc
+  User madduck
+  Hostname matilda.madduck.net
+  ConnectTimeout 60
 
 Host vizier.madduck.net | vizier
   ForwardAgent yes
@@ -58,10 +62,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
 
@@ -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
 
@@ -880,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