move atom to catalyst

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

diff --git a/.ssh/config.in b/.ssh/config.in
index e45a51230736b28c352f092b2f1a3c2b419e13fd..47fe5d1019946a9af2b5eacc8ff33f30cb2727f3 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -88,6 +88,9 @@ Host flics.madduck.net | flics
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+
 Host shelter.madduck.net | shelter
   Hostname shelter.madduck.net
 Host backup.madduck.net | backup
@@ -111,7 +114,6 @@ Host clegg.lehel.madduck.net | clegg.lehel | clegg
 
 Host albatross.lehel.madduck.net | albatross.lehel | albatross
   Hostname albatross.lehel.madduck.net
-  ForwardX11 yes
   HostKeyAlias albatross.lehel
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
@@ -123,6 +125,10 @@ Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
   ProxyJump clegg.dyndns.madduck.net
 
+Host bike.lehel.madduck.net | bike.lehel | bike
+  Hostname bike.lehel.madduck.net
+  HostKeyAlias bike.lehel
+
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
@@ -136,12 +142,10 @@ Host embryo.gauting.madduck.net | embryo
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting
-  ForwardX11 yes
 Host mothere
   Hostname embryo.gauting.madduck.net
   Port 22021
   CheckHostIP no
-  ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
@@ -153,9 +157,6 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 Host wall.mtvic.madduck.net | wall.mtvic | wall
   Hostname wall.mtvic.madduck.net
 
-Host atom.mtvic.madduck.net | atom.mtvic | atom
-  Hostname atom.mtvic.madduck.net
-
 Host bell.mtvic.madduck.net | bell.mtvic | bell
   Hostname bell.mtvic.madduck.net
 
@@ -169,19 +170,26 @@ Host julia-via-wall | rjulia
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
 
-Host lelina.mtvic.madduck.net | lelina.mtvic | lelina
-  ForwardX11 yes
+Host echo.mtvic.madduck.net | echo.mtvic | echo
+  Hostname echo.mtvic.madduck.net
+
+Host visitor*.mtvic.madduck.net | visitor*.mtvic
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### CATALYST
+
+Host atom.catalyst.madduck.net | atom.catalyst | atom
+  Hostname atom.catalyst.madduck.net
 
 ### ROAD WARRIORS
 
 Host fishbowl.*
   CheckHostIP no
-  ForwardX11 yes
   HostKeyAlias fishbowl
 
 Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
-  ForwardX11 yes
   HostKeyAlias fishbowl
   ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,lehel,gauting,rw}.madduck.net; eval fping -aAC1 -t500 $TRIES 2>&1 & eval fping6 -aAC1 -t500 $TRIES 2>&1; wait) | sed -rne 's, : ([[:digit:]]), @\1,p' | sort -t@ -k2n | sed -ne 's, .*,,p' | tr '\n' ','); echo Targets: \$TARGETS using \${TARGETS%%%%,*} … >&2; exec nc -vq0 \${TARGETS%%%%,*} %p"
 
@@ -207,10 +215,6 @@ Host tethered-sgs7e
 
 ### LOCAL VIRT HOSTS
 
-Host wafer.virt
-  RemoteForward 25000 localhost:25
-  ForwardX11 yes
-
 Host red | green | blue | yellow | black | white | orange | violet | wafer
   CanonicalDomains virt
   CanonicalizeHostname yes
@@ -254,11 +258,6 @@ Host kent.debconf.org | kent
 
 ### TILDE CLUB
 
-Host remotes.club
-  Hostname remotes.club
-  Port 9022
-  User madduck
-
 Host squiggle.city
   Hostname squiggle.city
   User madduck