X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/0caca36057b796df2d0b0d43139347c59de861bd..672fb6d86c1747f6e03bdb72e6f92fb106d7d4ba:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 3a309da..7231594 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
@@ -172,6 +172,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
@@ -187,6 +191,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
@@ -203,6 +212,14 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias albatross.lehel
+Host albatross-luks
+  Hostname albatross.lehel.madduck.net
+  HostKeyAlias albatross-luks.lehel.madduck.net
+  User root
+
+Host albatross-via-diamond
+  Hostname albatross.lehel.madduck.net
+  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
 
 ### GAUTING
 
@@ -255,7 +272,7 @@ 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; nc -vq0 \${TARGETS%%%%,*} %p"
 
 ### LOCAL VIRT HOSTS
 
@@ -297,6 +314,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
@@ -351,14 +372,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 no
+  #UpdateHostKeys no
   VerifyHostKeyDNS ask
   VisualHostKey no