X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/30db4f331936b1e72e352e89bdb2ba3f7fbeeecc..17b31de1d87d1e2eeb57307a2680e1c3893186a8:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 80f2d85..e460da7 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -34,6 +34,14 @@ Host ambassador.madduck.net | ambassador
   ForwardAgent yes
   Hostname ambassador.madduck.net
 
+Host alan.madduck.net | alan
+  ForwardAgent yes
+  Hostname alan.madduck.net
+
+Host swan.madduck.net | swan
+  ForwardAgent yes
+  Hostname swan.madduck.net
+
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
@@ -44,6 +52,10 @@ Host khyber-vnc
   ControlPath none
   Hostname khyber.madduck.net
 
+Host bike.madduck.net | bike
+  ForwardAgent yes
+  Hostname bike.madduck.net
+
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
@@ -157,6 +169,12 @@ Host julia.gern.madduck.net | julia
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
   HostKeyAlias julia.gern.madduck.net
+Host annex.gern.madduck.net | annex.gern
+  ForwardAgent yes
+  HostKeyAlias julia.gern.madduck.net
+Host shared.gern.madduck.net | shared.gern
+  ForwardAgent yes
+  HostKeyAlias julia.gern.madduck.net
 
 Host pict.gern.madduck.net | pict
   Hostname pict.gern.madduck.net
@@ -220,7 +238,13 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
 
 ### ROAD WARRIORS
 
-Host fishbowl | fishbowl.gern | fishbowl.lehel | fishbowl.rw.madduck.net
+Host fishbowl.*
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias fishbowl
+
+Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
@@ -844,9 +868,13 @@ Host zemlinsky.debian.org | zemlinsky
   Hostname zemlinsky.debian.org
   User madduck
 
-Host nelson.debconf.org | penta.debconf.org | nelson | summit
+Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
   Hostname nelson.debconf.org
-  ProxyCommand ssh people.debian.org nc -q0 %h %p
+  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+
+Host kent.debconf.org | kent
+  Hostname kent.debconf.org
+  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
 
 ### PENNY