X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/d29bbe79f16c37bc0ac653c033637d5700bc18ca..e6d5eb777744a2b02655ad3e2ae40e5481f1bc51:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 291d1de..59a2947 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -3,7 +3,7 @@ Host 127.0.0.1 | localhost
   ForwardX11Trusted yes
   NoHostAuthenticationForLocalhost yes
 
-### CHARADE KVM HOST
+### ECLIPSE KVM HOST
 
 Host eclipse.madduck.net | eclipse
   Hostname eclipse.madduck.net
@@ -12,8 +12,8 @@ Host eclipse-luks
   AddressFamily inet
   User root
 
-Host charade.madduck.net | charade
-  Hostname charade.madduck.net
+Host eclipse-fallback.madduck.net | eclipse-fallback
+  HostKeyAlias eclipse.madduck.net
 
 Host emily.madduck.net | emily | eclipse-kvm
   Hostname emily.madduck.net
@@ -92,13 +92,11 @@ 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
@@ -141,8 +139,6 @@ Host albatross.lehel.madduck.net | albatross.lehel | albatross
   DynamicForward localhost:9049
 Host albatross-luks
   Hostname albatross.lehel.madduck.net
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
   AddressFamily inet
   User root
 
@@ -173,11 +169,13 @@ Host julia.gern.madduck.net | julia.gern | julia
   LocalForward localhost:8388 localhost:8384
 Host julia-luks
   Hostname julia.gern.madduck.net
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
   AddressFamily inet
   User root
 
+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
@@ -224,96 +222,14 @@ Host mother
   Hostname mother.rw.vpn.madduck.net
   CheckHostIP no
 
-### PHONES
-
-Host oneplus5t | oneplus5t.phones.*
-  Port 2222
-  User shell
-  HostName oneplus5t.phones
-  HostKeyAlias oneplus5t.phones
-  LocalForward localhost:8383 localhost:8384
-
-Host tethered-oneplus5t
-  Port 2222
-  User shell
-  HostName 192.168.43.1
-  HostKeyAlias oneplus5t.phones
-  LocalForward localhost:8383 localhost:8384
-
-Host sgs7e | sgs7e.phones.*
-  Port 2222
-  User shell
-  HostName sgs7e.phones
-  HostKeyAlias sgs7e.phones
-  LocalForward localhost:8382 localhost:8384
-
-Host tethered-sgs7e
-  Port 2222
-  User shell
-  HostName 192.168.43.1
-  HostKeyAlias sgs7e.phones
-  LocalForward localhost:8382 localhost:8384
-
-Host sgs5m | sgs5m.phones.*
-  Port 2222
-  User shell
-  HostName sgs5m.phones
-  HostKeyAlias sgs5m.phones
-  LocalForward localhost:8381 localhost:8384
-
-### LOCAL VIRT HOSTS
-
-Host red | green | blue | yellow | black | white | orange | violet | wafer
-  CanonicalDomains virt
-  CanonicalizeHostname yes
-  CanonicalizeFallbackLocal no
-  CanonicalizeMaxDots 0
-  VerifyHostKeyDNS no
-  CheckHostIP no
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
-### DEBIAN
-
-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 people.debian.org | people
-  Hostname people.debian.org
-  HostKeyAlias paradis.debian.org
-
-Host master.debian.org | master
-  Hostname master.debian.org
-
-Match host *.debian.org
-  StrictHostKeyChecking ask
-  VerifyHostKeyDNS ask
-  User madduck
-
-### DEBCONF
-
-Host nelson.debconf.org | penta.debconf.org | nelson | summit | summit.debconf.org
-  Hostname nelson.debconf.org
-  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
-  ProxyJump sysyphus.madduck.net
-
 ### TILDE CLUB
 
 Host squiggle.city
   Hostname squiggle.city
   User madduck
 
-### NZ
-
-Host workbuffer.org | nz
-  Hostname workbuffer.org
+Host tilde.club
+  Hostname tilde.club
   User madduck
 
 ### MISC
@@ -330,10 +246,6 @@ 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
@@ -352,7 +264,10 @@ Host clegg.northdrive.de
 
 Match host *.madduck.net
   StrictHostKeyChecking ask
-  VerifyHostKeyDNS ask
+
+Match host *.debian.org
+  StrictHostKeyChecking ask
+  User madduck
 
 Host *
   IgnoreUnknown *
@@ -362,14 +277,10 @@ Host *
   ControlPersist 30
   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