tidy up ~/.ssh/config

1 files changed, 17 insertions, 87 deletions

diff --git a/.ssh/config b/.ssh/config
index fd9be91d..c9573e6e 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,38 +1,17 @@
 # -*- mode: conf-space -*-
 
-### SDF hosts
-
 Host tty.sdf.org | sdf
 HostName tty.sdf.org
-# ForwardAgent yes
-
-# Host meta.sdf.org | meta | iceland | sverige
-# HostName meta.sdf.org
-# Port 110
-# ForwardAgent yes
-# LocalForward 8022 ma:22
-# LocalForward 8025 mx:25
-# DynamicForward 1080
 
 Host odin.sdf-eu.org | sdfeu.org | sdf-eu.org | odin | sdfeu | sdf-eu
 HostName odin.sdf-eu.org
-# ForwardAgent yes
-
-# Host ma.sdf.org | ma
-# HostName ma.sdf.org
-# ForwardAgent yes
-# User spw
-# #HostName localhost
-# #Port 8022
-# #HostKeyAlias ma.sdf.org
-
-# Note that wildcards here match what is actually typed on the command
-# line, not the hostname of the machine we end up connecting to.
-# That's why 'sdf' is present
+
+# Wildcards here match what is actually typed on the command line, not the
+# hostname of the machine we end up connecting to, so we specify 'sdf' too.
 Host sdf sdfeu *.sdf.org *.sdf-eu.org
 User spw
 
-### Debian hosts
+####################################################################
 
 Host fasolo | ftp-master | ftp-master.debian.org
 HostName ftp-master.debian.org
@@ -43,40 +22,11 @@ ProxyJump ssh.debian.org
 
 Host *.debian.org
 User spwhitton
-# mention both host files so that ssh adds host keys for IP addresses
-# to the former file, not the latter
+# Specify both files so that ssh adds host keys for IPs to the former.
 UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts_debian
 StrictHostKeyChecking yes
 
-Host *.debian.net
-User spwhitton
-
-### my hosts
-
-Host zephyr.silentflame.com | zephyr
-User swhitton
-# HostName 192.168.0.110
-# CheckHostIP no
-# Ciphers aes256-ctr
-
-Host zephyr.abbeydaled.local
-User swhitton
-# HostName 192.168.0.110
-# CheckHostIP no
-# Ciphers aes256-ctr
-
-# Host artemis.silentflame.com | artemis
-# User swhitton
-# HostName artemis.local
-# CheckHostIP no
-
-Host hestia.silentflame.com | hestia
-User spwhitton
-
-# Host pan.silentflame.com | pan
-# User spwhitton
-# HostName 128.199.240.8
-# ForwardAgent yes
+####################################################################
 
 Host athena.silentflame.com | athena
 User spwhitton
@@ -84,26 +34,15 @@ HostName athena.silentflame.com
 ForwardAgent yes
 IdentityFile ~/.ssh/id_athena
 
-# for demeter's gitolite installation
+# For demeter's gitolite installation.
 Host git.spwhitton.name spwhitton.name
 IdentityFile ~/.ssh/id_athena
 
-Host hephaestus.silentflame.com | hephaestus
-User spwhitton
-ForwardAgent yes
-
-# Host poseidon.silentflame.com | poseidon
-# User spwhitton
-# HostName 159.100.240.143
-# ForwardAgent no
+####################################################################
 
-# Host shortgeese.silentflame.com | shortgeese
-# HostName shortgeese.local
-# ForwardAgent yes
-
-# Host iris.silentflame.com | iris
-# User spwhitton
-# ForwardAgent yes
+Host zephyr.silentflame.com | zephyr
+User swhitton
+ForwardAgent yes
 
 Host melete.silentflame.com | melete
 User spwhitton
@@ -113,9 +52,9 @@ Host erebus.silentflame.com | erebus
 User spwhitton
 ForwardAgent yes
 
-### other people's hosts
+####################################################################
 
-Host github
+Host github | github.com
 User git
 HostName github.com
 VerifyHostKeyDNS yes
@@ -123,15 +62,9 @@ VerifyHostKeyDNS yes
 Host u.arizona.edu | sage.u.arizona.edu | sage
 User spwhitton
 HostName u.arizona.edu
-# ForwardAgent yes
-
-# Host TallGeese
-# User nrosati
-# HostName 192.168.1.103
 
-# avoid any password prompts if something goes wrong with the agent;
-# when initialising a new rsync.net account, will need to comment this
-# out
+# Avoid any password prompts if something goes wrong with the agent; when
+# initialising a new rsync.net account, will need to comment this out.
 Host *.rsync.net
 PreferredAuthentications publickey
 
@@ -139,18 +72,15 @@ Host chiark
 User spwhitton
 HostName login.chiark.greenend.org.uk
 
-### global settings
+####################################################################
 
 Host *
-#Compression yes
 ControlMaster auto
 ControlPath /tmp/ssh-%u-%r@%h:%p
 ControlPersist 4h
 ServerAliveInterval 5
 ServerAliveCountMax 2
-ForwardAgent no
 NoHostAuthenticationForLocalhost yes
 ExitOnForwardFailure yes
-# visual host keys are annoying for myrepos
+# Visual host keys are cluttering when using myrepos.
 VisualHostKey no
-# Ciphers arcfour,blowfish-cbc