X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/44cc374c89d90ad23d076849a6b515abb37ed9b6..b38736a01f2ca7172fc6f7373d6c6b8bf162ffa8:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index a07790a..53e6374 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -1,29 +1,38 @@
 Host 127.0.0.1 | localhost
-  ForwardAgent yes
   ForwardX11 yes
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
-### CHARADE KVM HOST
+### ECLIPSE 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 eclipse.madduck.net | eclipse
+  Hostname eclipse.madduck.net
+Host eclipse-luks
+  Hostname eclipse.madduck.net
+  AddressFamily inet
+  User root
 
-Host emily.madduck.net | emily
-  ForwardAgent yes
+Host eclipse-fallback.madduck.net | eclipse-fallback
+  HostKeyAlias eclipse.madduck.net
+
+Host emily.madduck.net | emily | eclipse-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
@@ -31,123 +40,81 @@ 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 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 seamus.madduck.net | seamus
-  ForwardAgent yes
-  Hostname seamus.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 vera.madduck.net | vera
+  Hostname vera.madduck.net
 
-Host bike.madduck.net | bike
-  ForwardAgent yes
-  Hostname bike.madduck.net
+Host arnold.madduck.net | arnold
+  Hostname arnold.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
+Host seamus.madduck.net | seamus
+  Hostname seamus.madduck.net
 
-Host jugband.madduck.net | jugband
-  ForwardAgent yes
-  Hostname jugband.madduck.net
+Host cymbaline.madduck.net | cymbaline
+  Hostname cymbaline.madduck.net
 
-Host domine.madduck.net | domine
-  ForwardAgent yes
-  Hostname domine.madduck.net
-Host imap.madduck.net
-  HostKeyAlias domine.madduck.net
+Host lunatic.madduck.net | lunatic
+  Hostname lunatic.madduck.net
 
-Host aika.krafftwerk.de | aika
-  Hostname aika.krafftwerk.de
+### UNI ZURICH MACHINES
 
-Host sysyphus.madduck.net | sysyphus
-  ForwardAgent yes
-  Hostname sysyphus.madduck.net
-Host ssh443.madduck.net | ssh443
-  HostKeyAlias sysyphus.madduck.net
-  ForwardAgent yes
-  Port 443
-Host openvpn.madduck.net | openvpn
-  HostKeyAlias sysyphus.madduck.net
+Host gig.madduck.net | gig | eugene-kvm
+  Hostname gig.madduck.net
 
-### UNI ZURICH MACHINES
+Host eugene.madduck.net | eugene
+  Hostname eugene.madduck.net
+Host eugene-luks
+  Hostname eugene.madduck.net
+  AddressFamily inet
+  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
   User madduck
   HostKeyAlias diamond.madduck.net
 Host tunes.madduck.net | tunes
-  AddressFamily inet
   ControlMaster no
   Hostname tunes.madduck.net
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 Host flics.madduck.net | flics
-  AddressFamily inet
   ControlMaster no
   Hostname flics.madduck.net
   HostKeyAlias diamond.madduck.net
   IPQoS lowdelay af13
 
 Host shelter.madduck.net | shelter
-  ForwardAgent yes
   Hostname shelter.madduck.net
 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
+Host gnome.madduck.net | gnome
+  Hostname gnome.madduck.net
+
+### DOMINE / VPS2DAY
+
+Host domine.madduck.net | domine
+  Hostname domine.madduck.net
+  DynamicForward localhost:9031
 
 ### PIPER / BYTEMARK
 
@@ -159,213 +126,228 @@ 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
+Host wall.gern.madduck.net | wall.gern | wall
   Hostname wall.gern.madduck.net
+  HostKeyAlias wall.gern.madduck.net
 
-Host julia.gern.madduck.net | julia
+Host julia.gern.madduck.net | julia.gern | julia
   Hostname julia.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-
-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
+  LocalForward localhost:8388 localhost:8384
+Host julia-luks
+  Hostname julia.gern.madduck.net
+  AddressFamily inet
+  User root
 
-Host pict.gern.madduck.net | pict
-  Hostname pict.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
+Host kodi.gern.madduck.net | kodi
+  Hostname kodi.gern.madduck.net
+  User root
+
+Host echo.kids.gern | echo.kids | jukebox.kids.gern | jukebox.kids
+  Hostname echo.kids.gern.madduck.net
+  HostKeyAlias echo.kids.gern.madduck.net
 
-Host visitor*.gern.madduck.net | visitor*.gern | visitor*
+Host dyn*.gern.madduck.net | dyn*.*.gern.madduck.net | dyn*.gern | dyn*.*.gern | 10.39.*.*
   StrictHostKeyChecking no
   UserKnownHostsFile /dev/null
 
-### LEHEL
+### KRAFFTWERK
 
-Host clegg.lehel.madduck.net | clegg.lehel | clegg
-  CheckHostIP no
+Host albatross.fo.krafftwerk.de | albatross
+  HostName albatross.fo.krafftwerk.de
+  HostKeyAlias albatross.fo.krafftwerk.de
   ForwardAgent yes
-  Hostname clegg.lehel.madduck.net
+  LocalForward localhost:8387 localhost:8384
+  DynamicForward localhost:9049
+Host albatross-luks
+  HostName albatross.fo.krafftwerk.de
+  HostKeyAlias albatross.fo.krafftwerk.de
+  AddressFamily inet
+  User root
 
-Host albatross.lehel.madduck.net | albatross.lehel | albatross
-  Hostname albatross.lehel.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.lehel
+Host docker.fo.krafftwerk.de | dockerkr
+  HostName docker.fo.krafftwerk.de
+  HostKeyAlias docker.fo.krafftwerk.de
 
-### GAUTING
+### TONI
 
-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
+Host gerald.toni.madduck.net | gerald.toni | gerald | gerald.int.toni.immo | martin.int.toni.immo
+  Hostname gerald.int.toni.immo
+  HostKeyAlias gerald.toni.madduck.net
   ForwardAgent yes
-  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 dc01.samba-ad.toni.immo | dc01
+  Hostname dc01.samba-ad.toni.immo
+  HostKeyAlias dc01.samba-ad.toni.immo
 
-### MOUNT VICTORIA
+Host pve.int.toni.immo | pve
+  Hostname pve.int.toni.immo
+  HostKeyAlias pve.int.toni.immo
 
-Host atom.mtvic.madduck.net | atom.mtvic | atom
-  Hostname atom.mtvic.madduck.net
-  ForwardAgent yes
+Host fileserver.int.toni.immo | fileserver
+  Hostname fileserver.int.toni.immo
+  HostKeyAlias fileserver.int.toni.immo
 
-### ROAD WARRIORS
+Host postgres.int.toni.immo | postgres
+  Hostname postgres.int.toni.immo
+  HostKeyAlias postgres.int.toni.immo
 
-Host fishbowl.*
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias fishbowl
+Host wikijs.int.toni.immo | wikijs
+  Hostname wikijs.int.toni.immo
+  HostKeyAlias wikijs.int.toni.immo
 
-Host fishbowl | fishbowl.rw.madduck.net
-  CheckHostIP no
-  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"
+Host nginx.int.toni.immo | nginx | git.int.toni.immo
+  Hostname nginx.int.toni.immo
+  HostKeyAlias nginx.int.toni.immo
 
-### LOCAL VIRT HOSTS
+Host docker.int.toni.immo | docker
+  Hostname docker.int.toni.immo
+  HostKeyAlias docker.int.toni.immo
 
-Host wafer.virt
-  RemoteForward 25000 localhost:25
-  ForwardX11 yes
+Host docspell.int.toni.immo | docspell
+  Hostname docspell.int.toni.immo
+  HostKeyAlias docspell.int.toni.immo
 
-Host red | green | blue | yellow | black | white | orange | violet | wafer
-  CanonicalDomains virt
-  CanonicalizeHostname yes
-  CanonicalizeFallbackLocal no
-  CanonicalizeMaxDots 0
-  VerifyHostKeyDNS no
-  CheckHostIP no
+Host paperless.int.toni.immo | paperless
+  Hostname paperless.int.toni.immo
+  HostKeyAlias paperless.int.toni.immo
   ForwardAgent yes
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
 
-### DEBIAN
+Host dovecot.int.toni.immo | dovecot
+  Hostname dovecot.int.toni.immo
+  HostKeyAlias dovecot.int.toni.immo
 
-Host alioth.debian.org | anonscm.alioth.debian.org | svn.debian.org | git.debian.org | hg.debian.org | cvs.debian.org
-  HostKeyAlias moszumanska.debian.org
+Host backupserver.int.toni.immo | backupserver
+  Hostname backupserver.int.toni.immo
+  HostKeyAlias backupserver.int.toni.immo
 
-Host people.debian.org | people
-  Hostname people.debian.org
-  HostKeyAlias paradis.debian.org
+Host cups.int.toni.immo | cups
+  Hostname cups.int.toni.immo
+  HostKeyAlias cups.int.toni.immo
 
-Host master.debian.org | master
-  Hostname master.debian.org
+Host checkmk.int.toni.immo | checkmk
+  Hostname checkmk.int.toni.immo
+  HostKeyAlias checkmk.int.toni.immo
 
-Match host *.debian.org
-  StrictHostKeyChecking ask
-  VerifyHostKeyDNS ask
-  User madduck
+Host pve-backups.toni.immo | pve-backups
+  Hostname pve-backups.toni.immo
+  HostKeyAlias pve-backups.toni.immo
+  Port 23
+  User u368088
 
-### DEBCONF
+### ROAD WARRIORS
+
+Host lotus.gern
+  HostName lotus
+  ConnectTimeout 120
+  ForwardAgent yes
+  ProxyCommand ssh wall.gern.madduck.net "n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
+  LocalForward localhost:8385 localhost:8384
 
-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
+Host lotus.gern-vnc
+  HostName lotus
+  ConnectTimeout 120
+  ProxyCommand ssh wall.gern.madduck.net "n=30 && while ! nc -w 1 %h %p; do [ \$n -gt 0 ] || exit 1; wakeonlan -i 192.168.39.255 dc:fb:48:35:03:04; printf "%%02d: " \$n >&2; n=\$((\$n-1)); done"
+  LocalForward localhost:8385 localhost:8384
+  RemoteCommand pkill x11vnc; x11vnc -display :0 -nopw -localhost -norepeat -gone '/usr/bin/xautolock -locknow'
 
-Host kent.debconf.org | kent
-  Hostname kent.debconf.org
-  ProxyCommand ssh sysyphus.madduck.net nc -q0 %h %p
+Host lotus.* | lotus
+  CheckHostIP no
+  HostKeyAlias lotus
+  ForwardAgent yes
+  HostName lotus.fo.krafftwerk.de
+  LocalForward localhost:8385 localhost:8384
 
-### PENNY
+Host lotus-vnc
+  HostName lotus.fo.krafftwerk.de
+  HostKeyAlias lotus
+  ConnectTimeout 120
+  LocalForward localhost:5960 localhost:5900
+  RemoteCommand pkill x11vnc; x11vnc -display :0 -nopw -localhost -norepeat -gone '/usr/bin/xautolock -locknow'
 
-Host lion.mjollnir.org | lion | fog.mjollnir.org | fog
-  Hostname lion.mjollnir.org
+Host emerald | emerald.kids.gern | emerald.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias emerald
+  HostName emerald.kids.gern
+  LocalForward localhost:5932 localhost:5900
 
-### TILDE CLUB
+Host lelina | lelina.kids.gern | lelina.rw.madduck.net
+  CheckHostIP no
+  HostKeyAlias lelina
+  HostName lelina.kids.gern
+  LocalForward localhost:5931 localhost:5900
 
-Host remotes.club
-  Hostname remotes.club
-  Port 9022
-  User madduck
+Host mother
+  HostKeyAlias mother
+  Hostname mother.rw.vpn.madduck.net
+  CheckHostIP no
 
-Host tilde.camp
-  Hostname tilde.camp
-  User madduck
+### TILDE CLUB
 
 Host squiggle.city
   Hostname squiggle.city
   User madduck
 
-Host tilde.city
-  Hostname 001.tilde.city
+Host tilde.club
+  Hostname tilde.club
   User madduck
 
-### NZ
+### MISC
 
-Host workbuffer.org | nz
-  Hostname workbuffer.org
+Host nz
+  Hostname 202.78.240.196
   User madduck
-
-### MISC
+  DynamicForward localhost:9064
 
 Host github.com | github
   Hostname github.com
   User git
 
+Host gitlab.com | gitlab
+  Hostname gitlab.com
+  User git
+
+Host gitlab.debian.net | git.fosscommunity.in
+  Hostname gitlab.debian.net
+  User gitlab
+
+Host lion.mjollnir.org | lion
+  Hostname lion.mjollnir.org
+  User madduck
+
+Host files.northdrive.de | idiotheke | seamus.northdrive.de
+  Hostname seamus.northdrive.de
+  Port 37819
+  HostKeyAlias seamus.northdrive.de
+  User madduck
+
+Host clegg.northdrive.de
+  Port 37819
+  User madduck
+
 ### DEFAULTS
 
 Match host *.madduck.net
   StrictHostKeyChecking ask
-  VerifyHostKeyDNS ask
+
+Match host *.debian.org
+  StrictHostKeyChecking ask
+  User madduck
 
 Host *
   IgnoreUnknown *
-  ConnectTimeout 10
-  ControlPath ~/.var/ssh/ssh_control_%l_%h_%p_%r
+  ConnectTimeout 30
+  ControlPath ~/.var/ssh/ssh_control_%l_%k_%p_%r
   ControlMaster auto
   ControlPersist 30
-  ExitOnForwardFailure yes
+  ExitOnForwardFailure no
   ForwardAgent no
-  ForwardX11 no
-  ForwardX11Trusted no
   HashKnownHosts no
   NumberOfPasswordPrompts 2
   PasswordAuthentication yes
-  Protocol 2
   ServerAliveInterval 45
   StrictHostKeyChecking yes
-  UpdateHostKeys no
   VerifyHostKeyDNS ask
   VisualHostKey no