X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/64d1458bb91401b2f43a63055308c2fae2cbccfb..cf28ebbd1ca5a397d996fab3332ab8b518aac749:/.ssh/config.in?ds=sidebyside

diff --git a/.ssh/config.in b/.ssh/config.in
index 7af9d84..a9b5373 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
@@ -37,73 +41,46 @@ Host ambassador.madduck.net | ambassador
 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 irc-host.madduck.net | irc-host
-  User madduck
-  HostKeyAlias swan.madduck.net
-  ConnectTimeout 60
 
 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
 
-### KHYBER KVM HOST
-
-Host khyber.madduck.net | khyber
+Host cymbaline.madduck.net | cymbaline
   ForwardAgent yes
-  Hostname khyber.madduck.net
-Host khyber-vnc
-  ControlMaster no
-  ControlPath none
-  Hostname khyber.madduck.net
+  Hostname cymbaline.madduck.net
 
-Host bike.madduck.net | bike
+Host lunatic.madduck.net | lunatic
   ForwardAgent yes
-  Hostname bike.madduck.net
+  Hostname lunatic.madduck.net
 
-Host lotus.madduck.net | lotus
-  ForwardAgent yes
-  Hostname lotus.madduck.net
-Host git.madduck.net | git
-  User git
-  HostKeyAlias lotus.madduck.net
-Host git.debian.ch
-  User git
-  HostKeyAlias lotus.madduck.net
-Host martin-krafft.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
-Host phd.martin-krafft.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
-Host madduck.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
+### UNI ZURICH MACHINES
 
-Host domine.madduck.net | domine
+Host gig.madduck.net | gig
   ForwardAgent yes
-  Hostname domine.madduck.net
-Host imap.madduck.net
-  HostKeyAlias domine.madduck.net
+  Hostname gig.madduck.net
 
-Host sysyphus.madduck.net | sysyphus
-  ForwardAgent yes
-  Hostname sysyphus.madduck.net
-Host ssh443.madduck.net | ssh443
-  HostKeyAlias sysyphus.madduck.net
+Host eugene.madduck.net | eugene
   ForwardAgent yes
-  Port 443
-Host openvpn.madduck.net | openvpn
-  HostKeyAlias sysyphus.madduck.net
-
-### UNI ZURICH MACHINES
+  Hostname eugene.madduck.net
+Host eugene-luks
+  Hostname eugene.madduck.net
+  User root
 
 Host diamond.madduck.net | diamond
   ForwardAgent yes
@@ -132,16 +109,6 @@ Host shelter.madduck.net | shelter
 Host backup.madduck.net | backup
   HostKeyAlias shelter.madduck.net
 
-Host sergei.ifi.uzh.ch | sergei
-  Hostname sergei.ifi.uzh.ch
-  User krafft
-Host nikolai.ifi.uzh.ch | nikolai
-  Hostname nikolai.ifi.uzh.ch
-  User krafft
-Host franz.ifi.uzh.ch | franz
-  Hostname franz.ifi.uzh.ch
-  User krafft
-
 ### PIPER / BYTEMARK
 
 Host piper.madduck.net | piper
@@ -152,14 +119,6 @@ Host piper.madduck.net | piper
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.madduck.net
 
-### ARNOLD / GPLHOST
-
-Host arnold.madduck.net | arnold
-  Hostname arnold.madduck.net
-Host arnold-host | arnold-host.madduck.net
-  Hostname arnold-host.madduck.net
-  User xen05
-
 ### GERN
 
 Host wall.gern.madduck.net | wall
@@ -172,6 +131,10 @@ Host julia.gern.madduck.net | julia
   ForwardAgent yes
   ForwardX11 yes
 
+Host julia-via-diamond
+  Hostname julia.gern.madduck.net
+  ProxyJump diamond.madduck.net
+
 Host git.gern.madduck.net | git.gern
   ForwardAgent yes
   HostKeyAlias julia.gern.madduck.net
@@ -187,6 +150,12 @@ 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
+  ForwardAgent yes
+  HostKeyAlias jugband.gern
+
 Host visitor*.gern.madduck.net | visitor*.gern | visitor*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
@@ -203,11 +172,19 @@ 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 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
+  ProxyJump diamond.madduck.net
+
+Host visitor*.lehel.madduck.net | visitor*.lehel
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### GAUTING
 
@@ -229,17 +206,9 @@ Host mothere
   ForwardX11 yes
   HostKeyAlias mother.gauting.madduck.net
 
-Host brick.gauting.madduck.net | brick
-  Hostname brick.gauting.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-Host bricke
-  Hostname embryo.gauting.madduck.net
-  Port 22222
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias brick.gauting.madduck.net
+Host visitor*.lehel.madduck.net | visitor*.lehel
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### MOUNT VICTORIA
 
@@ -247,6 +216,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.*
@@ -260,7 +237,14 @@ 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"
+
+### PHONES
+
+Host sgs7e | sgs7e.phones.*
+  Port 2222
+  User admin
+  HostName sgs7e.phones
 
 ### LOCAL VIRT HOSTS
 
@@ -300,16 +284,15 @@ Match host *.debian.org
 
 Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
   Hostname nelson.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+  ProxyJump sysyphus.madduck.net
+
+Host itchy.debconf.org | itchy | wafer.debconf.org | wafer
+  Hostname itchy.debconf.org
+  ProxyJump sysyphus.madduck.net
 
 Host kent.debconf.org | kent
   Hostname kent.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
-
-### PENNY
-
-Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
-  Hostname lion.mjollnir.org
+  ProxyJump sysyphus.madduck.net
 
 ### TILDE CLUB
 
@@ -318,18 +301,10 @@ Host remotes.club
   Port 9022
   User madduck
 
-Host tilde.camp
-  Hostname tilde.camp
-  User madduck
-
 Host squiggle.city
   Hostname squiggle.city
   User madduck
 
-Host tilde.city
-  Hostname 001.tilde.city
-  User madduck
-
 ### NZ
 
 Host workbuffer.org | nz
@@ -342,6 +317,22 @@ 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
+  CheckHostIP no
+  Hostname grimble.mtfk.de
+
+Host lion.mjollnir.org | lion
+  Hostname lion.mjollnir.org
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
@@ -356,14 +347,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