X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/48ad92969b4cbc23c719011dce22bf309b65cf98..948222999dd48905d4334b9204a9348920a7f2cb:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index 56de3ab..7f459cb 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -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
@@ -208,10 +217,9 @@ Host albatross-luks
   HostKeyAlias albatross-luks.lehel.madduck.net
   User root
 
-Host jugband.lehel.madduck.net | jugband.lehel | jugband
-  Hostname jugband.lehel.madduck.net
-  ForwardX11 yes
-  HostKeyAlias jugband.lehel
+Host albatross-via-diamond
+  Hostname albatross.lehel.madduck.net
+  ProxyCommand ssh diamond.madduck.net nc -q0 %h %p
 
 ### GAUTING
 
@@ -306,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
@@ -360,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