config

commit 14b20d389f76db1f3939003150fe4dd555baec31
parent 762d1539c6d97c8746bbda61f3de212805bbb515
Author: Jacob R. Edwards <jacob@jacobedwards.org>
Date:   Thu, 13 Apr 2023 13:18:31 -0700

Update ssh config

Diffstat:
M
local/ssh/.ssh/config
 | 
46
+++++++++++++++++++++-------------------------

1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/local/ssh/.ssh/config b/local/ssh/.ssh/config
@@ -1,27 +1,33 @@
-# general
+# ssh config
+#
+# I sometimes use pseudo hostnames to select certain configurations,
+# such as mail and backup. I don't love the solution, but it's the
+# best one I can come up with.
 
 Host mail.*
-IdentityFile /home/jacob/.ssh/rsa-ids/etc/mail
+IdentityFile /home/jacob/.ssh/keys/etc/mail
 
 Host backup.*
-IdentityFile /home/jacob/.ssh/rsa-ids/etc/backup
+IdentityFile /home/jacob/.ssh/keys/etc/backup
 User root
 
 # localhost
 
-Host git
-Hostname localhost
-IdentityFile /home/jacob/.ssh/rsa-ids/localhost/git
-User git
+#Host git
+#Hostname localhost
+#IdentityFile /home/jacob/.ssh/keys/localhost/git
+#User git
 
-# var.lan
+# [wifi.]var.lan
 
-# (wifi.var.lan is simply the address of it's wireless NIC)
 Host var.lan wifi.var.lan
-Identityfile /home/jacob/.ssh/rsa-ids/var.lan/%r
 User jacob
+Identityfile /home/jacob/.ssh/keys/var.lan/%r
 
 Host mail.var.lan
+Hostname var.lan
+
+Host mail.wifi.var.lan
 Hostname wifi.var.lan
 
 Host backup.var.lan
@@ -30,25 +36,15 @@ Hostname wifi.var.lan
 # jacobedwards.org
 
 Host jacobedwards.org
-IdentityFile /home/jacob/.ssh/rsa-ids/%h/%u
-User jacob
-
-# git, cvs
-Host *.jacobedwards.org
-IdentityFile /home/jacob/.ssh/rsa-ids/ams/%h
-
-Host ams.jacobedwards.org
-IdentityFile /home/jacob/.ssh/rsa-ids/ams/jacob
 User jacob
+IdentityFile /home/jacob/.ssh/keys/jacobedwards.org/%r
 
 Host backup.jacobedwards.org
 Hostname jacobedwards.org
 
-# openbsd.amsterdam
-
-Host amshost
-Hostname server14.openbsd.amsterdam
-IdentityFile /home/jacob/.ssh/rsa-ids/ams/jacob
+Host host.jacobedwards.org
+Hostname server9.openbsd.amsterdam
+VerifyHostKeyDNS=yes
 Port 31415
 User jacob
-VerifyHostKeyDNS yes
+IdentityFile /home/jacob/.ssh/keys/jacobedwards.org/jacob