From 145a425bb83e884035dfadf123817eb1b5a4b7d9 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@rak.ac>
Date: Wed, 16 Jun 2021 22:19:34 -0400
Subject: update ssh config

---
 .ssh/config                  | 51 +++++++++++++++++++-------------------------
 .ssh/known_hosts.d/rak.ac    |  1 +
 .ssh/known_hosts.d/rsync.net |  1 +
 .ssh/known_hosts.d/ryanak.ca |  1 -
 4 files changed, 24 insertions(+), 30 deletions(-)
 create mode 100644 .ssh/known_hosts.d/rak.ac
 create mode 100644 .ssh/known_hosts.d/rsync.net
 delete mode 100644 .ssh/known_hosts.d/ryanak.ca

diff --git a/.ssh/config b/.ssh/config
index ba762bb..ab1899d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -10,24 +10,14 @@ Host ssh.debian.org *.ssh.debian.org
      User rak
      StrictHostKeyChecking yes
      UserKnownHostsFile ~/.ssh/known_hosts.d/debian
-Host *.debian.org master ravel alioth !*.ssh.debian.org !ssh.debian.org
+Host *.debian.org master !*.ssh.debian.org !ssh.debian.org
      User rak
      ProxyJump ssh.debian.org
      StrictHostKeyChecking yes
      UserKnownHostsFile ~/.ssh/known_hosts.d/debian
 ## QueensU hosts
-Host w310
-     HostName w310-181.caslab.queensu.ca
-Host ciscwww
-     HostName ciscwww.cs.queensu.ca
-Host ubuntu ubuntu.caslab.queensu.ca
-     HostName ubuntu.caslab.queensu.ca
-     User ryanak
 Host pinky brain
      HostName %h.cs.queensu.ca
-Host athena athena.caslab.queensu.ca
-     HostName athena.caslab.queensu.ca
-     User ryan
 Host linux1 hera zeus
      HostName %h.caslab.queensu.ca
 Host *.caslab.queensu.ca w310 ubuntu athena linux1 hera zeus
@@ -37,42 +27,41 @@ Host *.cs.queensu.ca ciscwww pinky brain
 Host *.queensu.ca w310 ubuntu athena linux1 hera zeus ciscwww pinky brain
      StrictHostKeyChecking yes
      UserKnownHostsFile ~/.ssh/known_hosts.d/queensu.ca
-## MIT hosts
-Host mit-athena
-     HostName athena.dialup.mit.edu
-Host all-night-tool
-     HostName %h.mit.edu
-Host *.mit.edu mit-athena all-night-tool
-     User rakavan
-     StrictHostKeyChecking yes
-     PreferredAuthentications keyboard-interactive,password
-     UserKnownHostsFile ~/.ssh/known_hosts.d/mit.edu
 ## McGill hosts
 Host *.cs.mcgill.ca
     User ryank
     StrictHostKeyChecking yes
     UserKnownHostsFile ~/.ssh/known_hosts.d/cs.mcgill.ca
 ## Ubuntu hosts
-Host puc
+Host puc people.ubuntu.com
     Hostname people.ubuntu.com
     User ryanakca
-## ryanak.ca hosts
-Host hades hades.ryanak.ca hades.rak.ac hades.home.arpa
-    HostKeyAlias hades.ryanak.ca
+## rak.ac hosts
+Host hades hades.rak.ac hades.home.arpa
+    HostKeyAlias hades.rak.ac
     CertificateFile ~/.ssh/id_rsa-hades-cert.pub
-Host eos eos.ryanak.ca eos.rak.ac eos.home.arpa
+Host eos eos.rak.ac eos.home.arpa
     HostKeyAlias eos.rak.ac
     CertificateFile ~/.ssh/id_rsa-eos-cert.pub
-Host ryanak.ca *.ryanak.ca rak.ac *.rak.ac *.vpn alpha epsilon upsilon nu eos aether hades
-    UserKnownHostsFile ~/.ssh/known_hosts.d/ryanak.ca
+Host ryanak.ca *.ryanak.ca rak.ac *.rak.ac eos hades
+    UpdateHostKeys no
+    UserKnownHostsFile ~/.ssh/known_hosts.d/rak.ac
     IdentityFile ~/.ssh/id_rsa
     StrictHostKeyChecking yes
     User rak
 ## CMU hosts
-Host *.andrew.cmu.edu linux.gp.cs.cmu.edu
+Host *.andrew.cmu.edu *.cs.cmu.edu
     GSSAPIAuthentication yes
     GSSAPIDelegateCredentials yes
     User rkavanag
+Host cclub
+    Hostname unix.club.cc.cmu.edu
+Host whelk oyster
+    Hostname %h.club.cc.cmu.edu
+Host *.club.cc.cmu.edu
+    GSSAPIAuthentication yes
+    GSSAPIDelegateCredentials yes
+    GSSAPITrustDNS yes
 ## Misc hosts
 Host republic republic.circumlunar.space
     Hostname republic.circumlunar.space
@@ -100,6 +89,10 @@ Host rtc rawtext.club
     User rak
 Host *.github.com
     HostKeyAlias github-server-pool.github.com
+Host rsync.net
+    Hostname de1270.rsync.net
+    UserKnownHostsFile ~/.ssh/known_hosts.d/rsync.net
+    User de1270
 ## Global defaults
 Host *
     ForwardX11 no
diff --git a/.ssh/known_hosts.d/rak.ac b/.ssh/known_hosts.d/rak.ac
new file mode 100644
index 0000000..ab9cb3a
--- /dev/null
+++ b/.ssh/known_hosts.d/rak.ac
@@ -0,0 +1 @@
+@cert-authority *.ryanak.ca,ryanak.ca,*.rak.ac,rak.ac,*.vpn ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACCdd/M+WdU0nbGXlHAIo4ZLXtnGo8Xj6WHnDDf7GHuyXfDRt3K3LLSjkDdU0lsllZkOC9ecUp+JtpufSQynWgdpwHIidgBs6kG/4nT3IS47BIeJAjTSI7v9RV4aRIAGf9YaKjlz0ujKT/4bc4Iue2P8flREBJ6ATNpDRSNhI8YGzLG6g== rak@ryanak.ca
diff --git a/.ssh/known_hosts.d/rsync.net b/.ssh/known_hosts.d/rsync.net
new file mode 100644
index 0000000..f485ba7
--- /dev/null
+++ b/.ssh/known_hosts.d/rsync.net
@@ -0,0 +1 @@
+de1270.rsync.net,2001:470:1:eb::116 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC2wi3kWdaW4W+tRu0uq8hhY1ffFbzZ4KCh0FUhFw0GIb8lWWvVnGInc9Tr538k0ZICFSSbs5faMgpMuHSX8QvU=
diff --git a/.ssh/known_hosts.d/ryanak.ca b/.ssh/known_hosts.d/ryanak.ca
deleted file mode 100644
index ab9cb3a..0000000
--- a/.ssh/known_hosts.d/ryanak.ca
+++ /dev/null
@@ -1 +0,0 @@
-@cert-authority *.ryanak.ca,ryanak.ca,*.rak.ac,rak.ac,*.vpn ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACCdd/M+WdU0nbGXlHAIo4ZLXtnGo8Xj6WHnDDf7GHuyXfDRt3K3LLSjkDdU0lsllZkOC9ecUp+JtpufSQynWgdpwHIidgBs6kG/4nT3IS47BIeJAjTSI7v9RV4aRIAGf9YaKjlz0ujKT/4bc4Iue2P8flREBJ6ATNpDRSNhI8YGzLG6g== rak@ryanak.ca
-- 
cgit v1.2.3