X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/35601fb1acc182ea1375be47416f26b7d5a5d09c..60686b68838e619ff8bfd4646326d1ae3f309e35:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index 1704c5d..3ea908e 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -41,6 +41,9 @@ Host ambassador.madduck.net | ambassador
 Host alan.madduck.net | alan
   ForwardAgent yes
   Hostname alan.madduck.net
+Host git.madduck.net | git
+  User git
+  HostKeyAlias alan.madduck.net
 
 Host swan.madduck.net | swan
   ForwardAgent yes
@@ -75,12 +78,6 @@ Host bike.madduck.net | bike
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
-Host git.madduck.net | git
-  User git
-  HostKeyAlias lotus.madduck.net
-Host git.debian.ch
-  User git
-  HostKeyAlias lotus.madduck.net
 Host martin-krafft.net
   User madduck
   HostKeyAlias lotus.madduck.net
@@ -178,7 +175,7 @@ Host julia.gern.madduck.net | julia
 
 Host julia-via-diamond
   Hostname julia.gern.madduck.net
-  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
+  ProxyJump diamond.madduck.net
 
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
@@ -198,6 +195,7 @@ Host pict.gern.madduck.net | pict
 Host jugband.gern.madduck.net | jugband.gern | jugband
   Hostname jugband.gern.madduck.net
   ForwardX11 yes
+  ForwardAgent yes
   HostKeyAlias jugband.gern
 
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
@@ -218,12 +216,13 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   HostKeyAlias albatross.lehel
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
-  HostKeyAlias albatross-luks.lehel.madduck.net
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
   User root
 
 Host albatross-via-diamond
   Hostname albatross.lehel.madduck.net
-  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
+  ProxyJump diamond.madduck.net
 
 ### GAUTING
 
@@ -263,6 +262,14 @@ Host atom.mtvic.madduck.net | atom.mtvic | atom
   Hostname atom.mtvic.madduck.net
   ForwardAgent yes
 
+Host atom-via-sysyphus
+  HostKeyAlias atom.mtvic.madduck.net
+  ProxyCommand ssh sysyphus.madduck.net nc -q0 localhost 22015
+
+Host bell.mtvic.madduck.net | bell.mtvic | bell | chip
+  Hostname bell.mtvic.madduck.net
+  ForwardAgent yes
+
 ### ROAD WARRIORS
 
 Host fishbowl.*
@@ -276,7 +283,7 @@ Host fishbowl | fishbowl.rw.madduck.net
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias fishbowl
-  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,gauting,mtvic,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; nc -vq0 \${TARGETS%%%%,*} %p"
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{gern,lehel,gauting,mtvic,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"
 
 ### LOCAL VIRT HOSTS
 
@@ -316,15 +323,15 @@ Match host *.debian.org
 
 Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
   Hostname nelson.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  ProxyJump sysyphus.madduck.net
 
 Host itchy.debconf.org | itchy | wafer.debconf.org | wafer
   Hostname itchy.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  ProxyJump sysyphus.madduck.net
 
 Host kent.debconf.org | kent
   Hostname kent.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  ProxyJump sysyphus.madduck.net
 
 ### PENNY
 
@@ -338,18 +345,10 @@ Host remotes.club
   Port 9022
   User madduck
 
-Host tilde.camp
-  Hostname tilde.camp
-  User madduck
-
 Host squiggle.city
   Hostname squiggle.city
   User madduck
 
-Host tilde.city
-  Hostname 001.tilde.city
-  User madduck
-
 ### NZ
 
 Host workbuffer.org | nz
@@ -362,6 +361,18 @@ Host github.com | github
   Hostname github.com
   User git
 
+Host gitlab.com | gitlab
+  Hostname gitlab.com
+  User gitlab
+
+Host gitlab.debian.net | git.fosscommunity.in
+  Hostname gitlab.debian.net
+  User gitlab
+
+Host grimble.mtfk.de | grimble | mtfk | mtfk.ddns.net
+  Hostname grimble.mtfk.de
+  Port 22022
+
 ### DEFAULTS
 
 Match host *.madduck.net