From 024e38efab51f1ca4615e368b1e9e8978f0c17ed Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Fri, 9 Sep 2022 04:25:08 +0100
Subject: [PATCH] Update .ssh/config for new servers.

---
 .ssh/config | 90 ++++++++++++++---------------------------------------
 1 file changed, 24 insertions(+), 66 deletions(-)

diff --git a/.ssh/config b/.ssh/config
index 7f7bb30..4f21886 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,55 +1,35 @@
-# Servers.
-Host amy amy.opensourcerers.net
-  ForwardAgent			yes
-  HostName			amy.opensourcerers.net
-  Port				9922
+# General settings.
+AddKeysToAgent			yes
+ConnectTimeout			30
+# Removed as this prevents use of ^Z suspension.
+# ControlMaster			auto
+# ControlPath			~/.ssh/%u@%l->%r@%h:%p
+# ControlPersist		7200
+ExitOnForwardFailure		yes
+HashKnownHosts			no
+SendEnv				LANG LC_* TERM
+StrictHostKeyChecking		accept-new
+VerifyHostKeyDNS		yes
+VisualHostKey			yes
 
-Host backup backup.slackware.uk
-  ForwardAgent			yes
-  Hostname			backup.slackware.uk
+# Remote servers.
+Host bender fry leela mirror seedbox
+  HostName			%n.hosts.slackware.network
   Port				9922
-
-Host bender bender.opensourcerers.net
   ForwardAgent			yes
-  HostName			bender.opensourcerers.net
-  Port				9922
 
-Host fry fry.opensourcerers.net
+Host esx0.hosts.slackware.network esx1.hosts.slackware.network
+  Port				22
+  ForwardAgent			no
+
+Host *.hosts.slackware.network
+  Port				9922
   ForwardAgent			yes
-  HostName			fry.opensourcerers.net
-  Port				9922
-
-Host kif kif.opensourcerers.net
-  ForwardAgent			yes
-  HostName			kif.opensourcerers.net
-  Port				9922
-
-Host leela leela.opensourcerers.net
-  ForwardAgent			yes
-  HostName			leela.opensourcerers.net
-  Port				9922
-
-Host seedbox seedbox.slackware.uk
-  ForwardAgent			yes
-  Hostname			seedbox.slackware.uk
-  Port				9922
-
-Host mirror mirror.slackware.uk
-  ForwardAgent			yes
-  Hostname			mirror.slackware.uk
-  Port				9922
-
-Host zapp zapp.opensourcerers.net
-  ForwardAgent			yes
-  HostName			zapp.opensourcerers.net
-  Port				9922
-
 
 # Home stuff.
 Host afterdark.org.uk
-  ForwardAgent			yes
-  Hostname			afterdark.org.uk
   Port				6722
+  ForwardAgent			yes
 
 Host phil lil tommy
   ForwardAgent			yes
@@ -59,28 +39,6 @@ Host full-* build-* clone-*
   ForwardAgent			yes
   User				root
 
-Host backupnas
-  ForwardAgent			yes
-  Hostname			helium.rainsbrook.co.uk
-  Port				2048
-
-
-# GitHub
+# GitHub.
 Host github.com
-  Hostname			github.com
   IdentityFile			~/.ssh/id_ed25519_github
-
-
-# General settings.
-Host *
-  # AddKeysToAgent		yes
-  ConnectTimeout		30
-  # Removed as this prevents use of ^Z suspension.
-  # ControlMaster		auto
-  # ControlPath			~/.ssh/%u@%l->%r@%h:%p
-  # ControlPersist		7200
-  ExitOnForwardFailure		yes
-  SendEnv			LANG LC_* TERM
-  # StrictHostKeyChecking	no
-  # VerifyHostKeyDNS		yes
-  VisualHostKey			yes