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

diff --git a/.ssh/config.in b/.ssh/config.in
index 80f2d85..04359c7 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -34,6 +34,22 @@ 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
+Host irc-host.madduck.net | swan
+  User madduck
+  HostKeyAlias swan.madduck.net
+  ConnectTimeout 60
+
+Host pulse.madduck.net | pulse
+  ForwardAgent yes
+  Hostname pulse.madduck.net
+
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
@@ -44,6 +60,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
@@ -137,10 +157,6 @@ Host arnold.madduck.net | arnold
 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,6 +173,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 +242,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 +872,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