aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.ssh/config61
-rw-r--r--.ssh/known_hosts.d/club.cc.cmu.edu3
-rw-r--r--.ssh/known_hosts.d/rak.ac2
3 files changed, 32 insertions, 34 deletions
diff --git a/.ssh/config b/.ssh/config
index ab1899d..30a1744 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,95 +4,90 @@ CheckHostIP yes
NoHostAuthenticationForLocalhost yes
## Debian hosts
-Host *.debian.net
- User rak
-Host ssh.debian.org *.ssh.debian.org
- User rak
- StrictHostKeyChecking yes
- UserKnownHostsFile ~/.ssh/known_hosts.d/debian
+Host master
+ Hostname %h.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
+ ProxyJump ssh.debian.org
+Match final host="*.debian.org"
+ UserKnownHostsFile ~/.ssh/known_hosts.d/debian
+
## QueensU hosts
Host pinky brain
- HostName %h.cs.queensu.ca
+ HostName %h.cs.queensu.ca
Host linux1 hera zeus
- HostName %h.caslab.queensu.ca
+ HostName %h.caslab.queensu.ca
Host *.caslab.queensu.ca w310 ubuntu athena linux1 hera zeus
User ryankca
Host *.cs.queensu.ca ciscwww pinky brain
- User ryan
+ User ryan
Host *.queensu.ca w310 ubuntu athena linux1 hera zeus ciscwww pinky brain
- StrictHostKeyChecking yes
- UserKnownHostsFile ~/.ssh/known_hosts.d/queensu.ca
+ StrictHostKeyChecking yes
+ UserKnownHostsFile ~/.ssh/known_hosts.d/queensu.ca
+
## McGill hosts
Host *.cs.mcgill.ca
User ryank
StrictHostKeyChecking yes
UserKnownHostsFile ~/.ssh/known_hosts.d/cs.mcgill.ca
+
## Ubuntu hosts
Host puc people.ubuntu.com
Hostname people.ubuntu.com
User ryanakca
+
## rak.ac hosts
+Host hades eos
+ HostName %h.rak.ac
Host hades hades.rak.ac hades.home.arpa
- HostKeyAlias hades.rak.ac
CertificateFile ~/.ssh/id_rsa-hades-cert.pub
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 eos hades
+Match final host="*.rak.ac,*.ryanak.ca,*.home.arpa"
UpdateHostKeys no
UserKnownHostsFile ~/.ssh/known_hosts.d/rak.ac
- IdentityFile ~/.ssh/id_rsa
StrictHostKeyChecking yes
- User rak
+
## CMU hosts
-Host *.andrew.cmu.edu *.cs.cmu.edu
- GSSAPIAuthentication yes
- GSSAPIDelegateCredentials yes
- User rkavanag
Host cclub
Hostname unix.club.cc.cmu.edu
-Host whelk oyster
+Host whelk oyster clam
Hostname %h.club.cc.cmu.edu
-Host *.club.cc.cmu.edu
+Match final host="*.club.cc.cmu.edu"
GSSAPIAuthentication yes
GSSAPIDelegateCredentials yes
GSSAPITrustDNS yes
+ UserKnownHostsFile ~/.ssh/known_hosts.d/club.cc.cmu.edu
+Match final host="*.andrew.cmu.edu,*.cs.cmu.edu"
+ GSSAPIAuthentication yes
+ GSSAPIDelegateCredentials yes
+ User rkavanag
+
## Misc hosts
Host republic republic.circumlunar.space
Hostname republic.circumlunar.space
- User rak
Host faeroes.sdf.org
- User rak
ControlMaster auto
ControlPath ~/.ssh/cm_socket/%r@%h:%p
-Host sdf *.sdf.org
+Host sdf
Hostname tty.sdf.org
- User rak
Host telehack
Hostname telehack.com
User ryanakca
Port 6668
Host tt tilde.team
Hostname tilde.team
- User rak
Host grex grex.org
Hostname grex.org
Ciphers aes256-gcm@openssh.com
- User rak
Host rtc rawtext.club
Hostname 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/club.cc.cmu.edu b/.ssh/known_hosts.d/club.cc.cmu.edu
new file mode 100644
index 0000000..f42693b
--- /dev/null
+++ b/.ssh/known_hosts.d/club.cc.cmu.edu
@@ -0,0 +1,3 @@
+unix.club.cc.cmu.edu,128.237.157.102,128.237.157.95 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC3ctF8tY3Izv0y5SIrGy/dS4VrFgqnqcJbCVe/rW5r2NnQla6JOqAcsxifbkgySTO5qY63zmdN0o4pmpvFB8ZU=
+whelk.club.cc.cmu.edu,128.237.157.102 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC3ctF8tY3Izv0y5SIrGy/dS4VrFgqnqcJbCVe/rW5r2NnQla6JOqAcsxifbkgySTO5qY63zmdN0o4pmpvFB8ZU=
+oyster.club.cc.cmu.edu,128.237.157.95 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC3ctF8tY3Izv0y5SIrGy/dS4VrFgqnqcJbCVe/rW5r2NnQla6JOqAcsxifbkgySTO5qY63zmdN0o4pmpvFB8ZU=
diff --git a/.ssh/known_hosts.d/rak.ac b/.ssh/known_hosts.d/rak.ac
index ab9cb3a..f329798 100644
--- a/.ssh/known_hosts.d/rak.ac
+++ b/.ssh/known_hosts.d/rak.ac
@@ -1 +1 @@
-@cert-authority *.ryanak.ca,ryanak.ca,*.rak.ac,rak.ac,*.vpn ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACCdd/M+WdU0nbGXlHAIo4ZLXtnGo8Xj6WHnDDf7GHuyXfDRt3K3LLSjkDdU0lsllZkOC9ecUp+JtpufSQynWgdpwHIidgBs6kG/4nT3IS47BIeJAjTSI7v9RV4aRIAGf9YaKjlz0ujKT/4bc4Iue2P8flREBJ6ATNpDRSNhI8YGzLG6g== rak@ryanak.ca
+@cert-authority *.rak.ac,*.home.arpa ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBACCdd/M+WdU0nbGXlHAIo4ZLXtnGo8Xj6WHnDDf7GHuyXfDRt3K3LLSjkDdU0lsllZkOC9ecUp+JtpufSQynWgdpwHIidgBs6kG/4nT3IS47BIeJAjTSI7v9RV4aRIAGf9YaKjlz0ujKT/4bc4Iue2P8flREBJ6ATNpDRSNhI8YGzLG6g== rak@ryanak.ca