X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/ad84d945f4d76103c06363857543ea21e534c785..8c5011b79b3fe6ed34794468bf0dd7b158964a10:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index c30ca37..d7900c3 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -21,6 +21,10 @@ Host emily.madduck.net | emily
 Host matilda.madduck.net | matilda
   ForwardAgent yes
   Hostname matilda.madduck.net
+Host irc-host.madduck.net | irc-host
+  User madduck
+  HostKeyAlias matilda.madduck.net
+  ConnectTimeout 60
 
 Host vizier.madduck.net | vizier
   ForwardAgent yes
@@ -41,10 +45,6 @@ Host alan.madduck.net | alan
 Host swan.madduck.net | swan
   ForwardAgent yes
   Hostname swan.madduck.net
-Host irc-host.madduck.net | irc-host
-  User madduck
-  HostKeyAlias swan.madduck.net
-  ConnectTimeout 60
 
 Host pulse.madduck.net | pulse
   ForwardAgent yes
@@ -54,6 +54,10 @@ Host seamus.madduck.net | seamus
   ForwardAgent yes
   Hostname seamus.madduck.net
 
+Host cymbaline.madduck.net | cymbaline
+  ForwardAgent yes
+  Hostname cymbaline.madduck.net
+
 ### KHYBER KVM HOST
 
 Host khyber.madduck.net | khyber
@@ -87,19 +91,12 @@ Host madduck.net
   User madduck
   HostKeyAlias lotus.madduck.net
 
-Host jugband.madduck.net | jugband
-  ForwardAgent yes
-  Hostname jugband.madduck.net
-
 Host domine.madduck.net | domine
   ForwardAgent yes
   Hostname domine.madduck.net
 Host imap.madduck.net
   HostKeyAlias domine.madduck.net
 
-Host aika.krafftwerk.de | aika
-  Hostname aika.krafftwerk.de
-
 Host sysyphus.madduck.net | sysyphus
   ForwardAgent yes
   Hostname sysyphus.madduck.net
@@ -179,6 +176,10 @@ Host julia.gern.madduck.net | julia
   ForwardAgent yes
   ForwardX11 yes
 
+Host julia-via-diamond
+  Hostname julia.gern.madduck.net
+  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
+
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
   HostKeyAlias julia.gern.madduck.net
@@ -194,6 +195,11 @@ Host pict.gern.madduck.net | pict
   ForwardAgent yes
   ForwardX11 yes
 
+Host jugband.gern.madduck.net | jugband.gern | jugband
+  Hostname jugband.gern.madduck.net
+  ForwardX11 yes
+  HostKeyAlias jugband.gern
+
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
@@ -210,6 +216,15 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias albatross.lehel
+Host albatross-luks
+  Hostname albatross.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
 
 ### GAUTING
 
@@ -249,6 +264,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.*
@@ -262,21 +285,24 @@ Host fishbowl | fishbowl.rw.madduck.net
   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"
+  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
 
+Host wafer.virt
+  RemoteForward 25000 localhost:25
+  ForwardX11 yes
+
 Host red | green | blue | yellow | black | white | orange | violet | wafer
+  CanonicalDomains virt
+  CanonicalizeHostname yes
+  CanonicalizeFallbackLocal no
+  CanonicalizeMaxDots 0
   VerifyHostKeyDNS no
   CheckHostIP no
   ForwardAgent yes
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
-  ControlMaster no
-  CanonicalDomains virt
-  CanonicalizeHostname yes
-  CanonicalizeFallbackLocal no
-  CanonicalizeMaxDots 0
 
 ### DEBIAN
 
@@ -301,6 +327,10 @@ Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.o
   Hostname nelson.debconf.org
   ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
 
+Host itchy.debconf.org | itchy | wafer.debconf.org | wafer
+  Hostname itchy.debconf.org
+  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
@@ -341,6 +371,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
@@ -355,14 +397,14 @@ Host *
   ControlPersist 30
   ExitOnForwardFailure yes
   ForwardAgent no
-  ForwardX11 no
-  ForwardX11Trusted no
+  #ForwardX11 no
+  #ForwardX11Trusted no
   HashKnownHosts no
   NumberOfPasswordPrompts 2
   PasswordAuthentication yes
   Protocol 2
   ServerAliveInterval 45
   StrictHostKeyChecking yes
-  UpdateHostKeys ask
+  #UpdateHostKeys no
   VerifyHostKeyDNS ask
   VisualHostKey no