X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/15baad8dc804fee1aec86b8d293556dff7362b82..45aadb9813cf50bcc7a5fcae84b61e22274c5b59:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index 0644157..a62c746 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -53,6 +53,10 @@ 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
@@ -61,50 +65,22 @@ Host cymbaline.madduck.net | cymbaline
   ForwardAgent yes
   Hostname cymbaline.madduck.net
 
-### KHYBER KVM HOST
-
-Host khyber.madduck.net | khyber
-  ForwardAgent yes
-  Hostname khyber.madduck.net
-Host khyber-vnc
-  ControlMaster no
-  ControlPath none
-  Hostname khyber.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 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
@@ -143,55 +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
-  CheckHostIP no
-  ForwardAgent yes
-  Hostname wall.gern.madduck.net
-
-Host julia.gern.madduck.net | julia
-  Hostname julia.gern.madduck.net
-  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
-Host annex.gern.madduck.net | annex.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-Host shared.gern.madduck.net | shared.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-
-Host pict.gern.madduck.net | pict
-  Hostname pict.gern.madduck.net
-  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
-
 ### LEHEL
 
 Host clegg.lehel.madduck.net | clegg.lehel | clegg
@@ -210,9 +137,13 @@ Host albatross-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-diamond
+Host albatross-via-clegg
   Hostname albatross.lehel.madduck.net
-  ProxyJump diamond.madduck.net
+  ProxyJump clegg.dyndns.madduck.net
+
+Host visitor*.lehel.madduck.net | visitor*.lehel
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
 
 ### GAUTING
 
@@ -234,17 +165,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
 
@@ -275,6 +198,13 @@ Host fishbowl | fishbowl.rw.madduck.net
   HostKeyAlias fishbowl
   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
 
 Host wafer.virt
@@ -354,9 +284,13 @@ Host gitlab.debian.net | git.fosscommunity.in
   Hostname gitlab.debian.net
   User gitlab
 
-Host grimble.mtfk.de | grimble | mtfk | mtfk.ddns.net
+Host grimble.mtfk.de | grimble | mtfk
+  CheckHostIP no
   Hostname grimble.mtfk.de
-  Port 22022
+
+Host lion.mjollnir.org | lion
+  Hostname lion.mjollnir.org
+  User madduck
 
 ### DEFAULTS