From 31abd0abb8055b334b990e3ccc648985c8e92c5e Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Sun, 21 May 2023 01:12:26 +0100
Subject: [PATCH] Sync .ssh/config with master.

---
 .ssh/config | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/.ssh/config b/.ssh/config
index 929e9fd..88aa9f4 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -6,48 +6,53 @@ ConnectTimeout			30
 # ControlPath			${HOME}/.ssh/%u@%l->%r@%h:%p
 # ControlPersist		7200
 ExitOnForwardFailure		yes
+ForwardAgent			yes
 HashKnownHosts			no
+RemoteForward			%d/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
 SendEnv				LANG LC_* TERM
 StrictHostKeyChecking		accept-new
 VerifyHostKeyDNS		yes
 VisualHostKey			yes
 
 # Temp.
-Host zapp
+Host zapp zapp.opensourcerers.net
   Hostname			zapp.opensourcerers.net
   Port				9922
-  ForwardAgent			yes
-  RemoteForward			%d/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
 
 # Remote servers.
-Host bender fry leela mirror seedbox
-  HostName			%h.hosts.slackware.network
+Host amy amy.hosts.slackware.network bender bender.hosts.slackware.network fry fry.hosts.slackware.network leela leela.hosts.slackware.network mirror mirror.hosts.slackware.network seedbox seedbox.hosts.slackware.network
+  CanonicalDomains		hosts.slackware.network
+  CanonicalizeHostname		yes
   Port				9922
-  ForwardAgent			yes
-  RemoteForward			%d/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
 
-Host esx0.hosts.slackware.network esx1.hosts.slackware.network
-  Port				22
-
-Host *.hosts.slackware.network
-  Port				9922
-  ForwardAgent			yes
-  RemoteForward			%d/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
+Host as.hosts.slackware.network esx0.hosts.slackware.network esx1.hosts.slackware.network
+  User				root
+  ForwardAgent			no
+  ClearAllForwardings		yes
 
 # Home stuff.
 Host afterdark.org.uk
   Port				6722
-  ForwardAgent			yes
 
-Host phil lil tommy-wifi
-  ForwardAgent			yes
+Host lil phil tommy-wifi
   ForwardX11Trusted		yes
 
-Host full-* build-* clone-*
-  ForwardAgent			yes
-  RemoteForward			/root/.gnupg/S.gpg-agent	${HOME}/.gnupg/S.gpg-agent
+Host esx0 esx1 esx2 esx3 gw vcsa
+  User				root
+  ForwardAgent			no
+  ClearAllForwardings		yes
+
+Host rpi0 rpi1 rpi2
+  User				pi
+  ForwardAgent			no
+  ClearAllForwardings		yes
+
+Host build-* clone-* full-*
   User				root
 
 # GitHub.
 Host github.com
+  User				git
   IdentityFile			${HOME}/.ssh/id_ed25519_github
+  ForwardAgent			no
+  ClearAllForwardings		yes