X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/83c4a70757f91a9aef76fc0ae0d7fa8b29003a8d..5a8078d8d93a56f3dfb421490cd4326e45ea5450:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 1dff9d9..3ddafb6 100644
--- 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,28 +6,30 @@ 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
   ControlPath none
   Hostname charade.madduck.net
 
-Host emily.madduck.net | emily
-  ForwardAgent yes
+Host emily.madduck.net | emily | charade-kvm
   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 ssh443
+  User madduck
+  HostKeyAlias matilda.madduck.net
+  Hostname matilda.madduck.net
+  Port 443
+  ConnectTimeout 60
 
 Host vizier.madduck.net | vizier
-  ForwardAgent yes
   Hostname vizier.madduck.net
 Host admin.madduck.net | admin
   Hostname admin.madduck.net
@@ -36,56 +37,51 @@ 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
+  LocalForward localhost:8390 localhost:8384
 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 arnold.madduck.net | arnold
+  Hostname arnold.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
+Host gig.madduck.net | gig | eugene-kvm
   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
+  LocalForward localhost:8389 localhost:8384
+  DynamicForward localhost:9041
 Host debian.madduck.net | debian
   HostKeyAlias diamond.madduck.net
 Host scratch.madduck.net | scratch
@@ -104,8 +100,11 @@ Host flics.madduck.net | flics
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+  DynamicForward localhost:9031
+
 Host shelter.madduck.net | shelter
-  ForwardAgent yes
   Hostname shelter.madduck.net
 Host backup.madduck.net | backup
   HostKeyAlias shelter.madduck.net
@@ -124,23 +123,30 @@ 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
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-clegg
+Host albatross-via-clegg | ralbatross
   Hostname albatross.lehel.madduck.net
   ProxyJump clegg.dyndns.madduck.net
+  AddressFamily inet
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
+
+Host bike.lehel.madduck.net | bike.lehel | bike | clegg-kvm
+  Hostname bike.lehel.vpn.madduck.net
+  HostKeyAlias bike.lehel
+  ProxyJump domine.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no
@@ -148,79 +154,98 @@ Host visitor*.lehel.madduck.net | visitor*.lehel
 
 ### GAUTING
 
-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
+  Hostname mother.fritz.box
+  HostKeyAlias mother.gauting.madduck.net
+
 Host mothere
-  Hostname embryo.gauting.madduck.net
-  Port 22021
+  Hostname mother.dyndns.madduck.net
+  Port 22221
   CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
-Host visitor*.lehel.madduck.net | visitor*.lehel
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
 ### MTVIC
 
-Host atom.mtvic.madduck.net | atom.mtvic | atom
-  Hostname atom.mtvic.madduck.net
-  ForwardAgent yes
+Host wall.mtvic.madduck.net | wall.mtvic | wall
+  Hostname wall.mtvic.madduck.net
 
-Host atom-via-sysyphus
-  HostKeyAlias atom.mtvic.madduck.net
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 localhost 22015
+Host wall-ipv4
+  Hostname wall.mtvic.madduck.net
+  AddressFamily inet
 
 Host julia.mtvic.madduck.net | julia.mtvic | julia
   Hostname julia.mtvic.madduck.net
-  ForwardAgent yes
+  LocalForward localhost:8388 localhost:8384
+
+Host julia-via-wall | rjulia
+  Hostname julia.mtvic.madduck.net
+  ProxyJump wall-ipv4
+  LocalForward localhost:8388 localhost:8384
 
 Host jugband.mtvic.madduck.net | jugband.mtvic | jugband
   Hostname jugband.mtvic.madduck.net
-  ForwardAgent yes
+
+Host wing.mtvic.madduck.net | wing.mtvic | wing
+  Hostname wing.mtvic.madduck.net
+
+Host echo.mtvic.madduck.net | echo.mtvic | echo
+  Hostname echo.mtvic.madduck.net
+
+Host visitor*.mtvic.madduck.net | visitor*.mtvic
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+
+### CATALYST
+
+Host atom.catalyst.madduck.net | atom.catalyst | atom
+  Hostname atom.catalyst.vpn.madduck.net
+  HostKeyAlias atom.catalyst.madduck.net
+  CheckHostIP no
+  ProxyJump domine.madduck.net
 
 ### ROAD WARRIORS
 
-Host fishbowl.*
+Host lotus.*
   CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl
+  HostKeyAlias lotus
+  LocalForward localhost:8385 localhost:8384
 
-Host fishbowl | fishbowl.rw.madduck.net
+Host lotus | lotus.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"
+  HostKeyAlias lotus
+  ProxyCommand bash -c "TARGETS=$( (TRIES=%h.{mtvic,catalyst,lehel,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"
+  LocalForward localhost:8385 localhost:8384
+
+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
+  HostKeyAlias sgs7e.phones
+  LocalForward localhost:8383 localhost:8384
 
 Host tethered-sgs7e
   Port 2222
-  User admin
+  User shell
   HostName 192.168.43.1
   HostKeyAlias sgs7e.phones
+  LocalForward localhost:8383 localhost:8384
 
-### LOCAL VIRT HOSTS
+Host sgs5m | sgs5m.phones.*
+  User shell
+  HostName sgs5m.phones
+  HostKeyAlias sgs5m.phones
+  LocalForward localhost:8382 localhost:8384
 
-Host wafer.virt
-  RemoteForward 25000 localhost:25
-  ForwardX11 yes
+### LOCAL VIRT HOSTS
 
 Host red | green | blue | yellow | black | white | orange | violet | wafer
   CanonicalDomains virt
@@ -229,7 +254,6 @@ Host red | green | blue | yellow | black | white | orange | violet | wafer
   CanonicalizeMaxDots 0
   VerifyHostKeyDNS no
   CheckHostIP no
-  ForwardAgent yes
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
@@ -266,11 +290,6 @@ Host kent.debconf.org | kent
 
 ### TILDE CLUB
 
-Host remotes.club
-  Hostname remotes.club
-  Port 9022
-  User madduck
-
 Host squiggle.city
   Hostname squiggle.city
   User madduck
@@ -289,7 +308,7 @@ Host github.com | github
 
 Host gitlab.com | gitlab
   Hostname gitlab.com
-  User gitlab
+  User git
 
 Host gitlab.debian.net | git.fosscommunity.in
   Hostname gitlab.debian.net
@@ -303,6 +322,10 @@ Host lion.mjollnir.org | lion
   Hostname lion.mjollnir.org
   User madduck
 
+Host files.northdrive.de | idiotheke
+  Hostname files.northdrive.de
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
@@ -311,11 +334,11 @@ Match host *.madduck.net
 
 Host *
   IgnoreUnknown *
-  ConnectTimeout 10
+  ConnectTimeout 30
   ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
   ControlMaster auto
   ControlPersist 30
-  ExitOnForwardFailure yes
+  ExitOnForwardFailure no
   ForwardAgent no
   #ForwardX11 no
   #ForwardX11Trusted no