Disable forwarding agent in wake of matrix.org attack

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

diff --git a/.ssh/config.in b/.ssh/config.in
index a2ca241f27b0048865442dad7d58795321c87eea..e45a51230736b28c352f092b2f1a3c2b419e13fd 100644 (file)
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -1,5 +1,4 @@
 Host 127.0.0.1 | localhost
-  ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
@@ -7,7 +6,6 @@ Host 127.0.0.1 | localhost
 ### CHARADE KVM HOST
 
 Host charade.madduck.net | charade
-  ForwardAgent yes
   Hostname charade.madduck.net
 Host charade-vnc
   ControlMaster no
@@ -15,19 +13,17 @@ Host charade-vnc
   Hostname charade.madduck.net
 
 Host emily.madduck.net | emily
-  ForwardAgent yes
   Hostname emily.madduck.net
 
 Host matilda.madduck.net | matilda
-  ForwardAgent yes
   Hostname matilda.madduck.net
 Host irc-host.madduck.net | irc-host
   User madduck
   HostKeyAlias matilda.madduck.net
+  Hostname matilda.madduck.net
   ConnectTimeout 60
 
 Host vizier.madduck.net | vizier
-  ForwardAgent yes
   Hostname vizier.madduck.net
 Host admin.madduck.net | admin
   Hostname admin.madduck.net
@@ -35,55 +31,44 @@ Host admin.madduck.net | admin
   User git
 
 Host ambassador.madduck.net | ambassador
-  ForwardAgent yes
   Hostname ambassador.madduck.net
 
 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
   Hostname swan.madduck.net
 
 Host pulse.madduck.net | pulse
-  ForwardAgent yes
   Hostname pulse.madduck.net
 
 Host vera.madduck.net | vera
-  ForwardAgent yes
   Hostname vera.madduck.net
 
 Host seamus.madduck.net | seamus
-  ForwardAgent yes
   Hostname seamus.madduck.net
 
 Host cymbaline.madduck.net | cymbaline
-  ForwardAgent yes
   Hostname cymbaline.madduck.net
 
 Host lunatic.madduck.net | lunatic
-  ForwardAgent yes
   Hostname lunatic.madduck.net
 
 ### UNI ZURICH MACHINES
 
 Host gig.madduck.net | gig
-  ForwardAgent yes
   Hostname gig.madduck.net
 
 Host eugene.madduck.net | eugene
-  ForwardAgent yes
   Hostname eugene.madduck.net
 Host eugene-luks
   Hostname eugene.madduck.net
   User root
 
 Host diamond.madduck.net | diamond
-  ForwardAgent yes
   Hostname diamond.madduck.net
 Host debian.madduck.net | debian
   HostKeyAlias diamond.madduck.net
@@ -104,7 +89,6 @@ Host flics.madduck.net | flics
   IPQoS lowdelay af13
 
 Host shelter.madduck.net | shelter
-  ForwardAgent yes
   Hostname shelter.madduck.net
 Host backup.madduck.net | backup
   HostKeyAlias shelter.madduck.net
@@ -123,12 +107,10 @@ Host cirrus.madduck.net | cirrus
 
 Host clegg.lehel.madduck.net | clegg.lehel | clegg
   CheckHostIP no
-  ForwardAgent yes
   Hostname clegg.lehel.madduck.net
 
 Host albatross.lehel.madduck.net | albatross.lehel | albatross
   Hostname albatross.lehel.madduck.net
-  ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias albatross.lehel
 Host albatross-luks
@@ -137,7 +119,7 @@ Host albatross-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-clegg
+Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
   ProxyJump clegg.dyndns.madduck.net
 
@@ -149,19 +131,16 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 
 Host embryo.gauting.madduck.net | embryo
   CheckHostIP no
-  ForwardAgent yes
   Hostname embryo.gauting.madduck.net
   HostKeyAlias embryo.gauting.madduck.net
 
 Host mother.gauting | mother | mother.gauting.madduck.net
   Hostname mother.gauting
-  ForwardAgent yes
   ForwardX11 yes
 Host mothere
   Hostname embryo.gauting.madduck.net
   Port 22021
   CheckHostIP no
-  ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
@@ -171,47 +150,58 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 
 ### MTVIC
 
+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
-  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
+  Hostname bell.mtvic.madduck.net
 
 Host julia.mtvic.madduck.net | julia.mtvic | julia
   Hostname julia.mtvic.madduck.net
-  ForwardAgent yes
+
+Host julia-via-wall | rjulia
+  Hostname julia.mtvic.madduck.net
+  ProxyJump wall.mtvic.madduck.net
 
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
-  ForwardAgent yes
+
+Host lelina.mtvic.madduck.net | lelina.mtvic | lelina
+  ForwardX11 yes
 
 ### ROAD WARRIORS
 
 Host fishbowl.*
   CheckHostIP no
-  ForwardAgent yes
   ForwardX11 yes
   HostKeyAlias fishbowl
 
 Host fishbowl | fishbowl.rw.madduck.net
   CheckHostIP no
-  ForwardAgent yes
   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"
 
+Host ini | ini.dyndns.madduck.net
+  CheckHostIP no
+  HostKeyAlias ini.dyndns.madduck.net
+  HostName ini.dyndns.madduck.net
+  Port 13579
+  User christine
+
 ### PHONES
 
 Host sgs7e | sgs7e.phones.*
   Port 2222
-  User admin
+  User shell
   HostName sgs7e.phones
 
 Host tethered-sgs7e
   Port 2222
-  User admin
+  User shell
   HostName 192.168.43.1
   HostKeyAlias sgs7e.phones
 
@@ -228,7 +218,6 @@ Host red | green | blue | yellow | black | white | orange | violet | wafer
   CanonicalizeMaxDots 0
   VerifyHostKeyDNS no
   CheckHostIP no
-  ForwardAgent yes
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null