move IRC to swan

[etc/ssh.git] / .ssh / config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 899ff104e39936a966497a3834651d71d1179870..04359c70ebec76cf3fa1c13eabf5fd384dd14129 100644 (file)
--- 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
@@ -86,12 +106,6 @@ Host ssh443.madduck.net | ssh443
 Host openvpn.madduck.net | openvpn
   HostKeyAlias sysyphus.madduck.net
 
-Host wots.madduck.net | wots
-  ForwardAgent yes
-  Hostname wots.madduck.net
-Host buildd.debian.madduck.net | buildd
-  HostKeyAlias wots.madduck.net
-
 ### UNI ZURICH MACHINES
 
 Host diamond.madduck.net | diamond
@@ -131,28 +145,18 @@ Host franz.ifi.uzh.ch | franz
   Hostname franz.ifi.uzh.ch
   User krafft
 
-### SWAN / BYTEMARK
-
-Host swan-host | swan-host.madduck.net
-  Hostname swan-host.madduck.net
-  User krafft
+### PIPER / BYTEMARK
 
-Host swan.madduck.net | swan
-  ForwardAgent yes
-  Hostname swan.madduck.net
+Host piper.madduck.net | piper
+  Hostname piper.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
 
@@ -164,10 +168,17 @@ Host wall.gern.madduck.net | wall
 Host julia.gern.madduck.net | julia
   Hostname julia.gern.madduck.net
   ForwardAgent yes
+  ForwardX11 yes
 
 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
@@ -231,10 +242,32 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
 
 ### ROAD WARRIORS
 
-Host fishbowl
+Host fishbowl.*
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias fishbowl
+
+Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes
+  HostKeyAlias fishbowl
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,rw}.madduck.net; eval fping -aAC1 -t100 $TRIES; eval fping6 -aAC1 -t100 $TRIES; wait) 2>&1 | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; nc -vq0 \${TARGETS%%%%,*} %p"
+
+### LOCAL VIRT HOSTS
+
+Host *.virt | 192.168.122.* | red | green | blue | yellow | black | white | orange | violet
+  CheckHostIP no
+  ForwardAgent yes
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  ControlMaster no
+  User root
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
 
 ### DEBIAN
 
@@ -839,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