more ssh config finangling

9 files changed, 13 insertions, 8 deletions

diff --git a/private_dot_ssh/authorized_keys b/private_dot_ssh/authorized_keys
index c057ac0..6b0d340 100644
--- a/private_dot_ssh/authorized_keys
+++ b/private_dot_ssh/authorized_keys
@@ -1,3 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19fbfGZB+uadDcY+9T0kc+IzpVxZCSD90jgQapU2293nkbGmfxR0FGvzxGSM2puyXV8ds07PGL/HE5lmNpc9FHrtK7VDg8nQk34XdGCKbWLglzRn3vkLr1VqjmVbTw/c5jGdK4WcItsiz5prMX9JQwHhfbq1UhwaVz/Kj0+tlTO9zRBERPd7fCkNoi3SX0Vc/1jhi1yup0BbwXCxI9VeTDcpmQ/Ikp8WYSbvz2L6kMFIqyclRWPiYuxLV40UXT1HHaUWRzqeTD+HCIaynklB40uRYYshu1RB1TtAxOJqYqZ0fLTsrOuMHzQChix7Q/FG6fw5KTAD58po3niDotJSojczWOZYYI+iDA41iYRfq82e+CpTcjlGm53R5lWGeqLgdFn3nmGXsrP98SjQy8cFo2EPvmgvKpyfY1Owbgz+zVFyjNsRKJ4xHLFGK+Cmp/1Nx+tDJmDgiV46mLnkHmTyLiadUSAbeVwREUTtFQfOqUPmb08MmolSvPS9orjmhz5EeeFoUmPP4ThnrUDT3ylR12P5HstyFLqoeslujUeT2/nSPWOIutmas6eT2F34zaqnD+ue/F/x4f7rk4jN4cp6BFzz723/0YOHyYv3tJB49hYmCXDmtTtrouvMf2ozNE64Z02uu0mNV7vjnfA7ciXQTo1zwkpl8+UPwuX0xiqA13Q== rak@zeta
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAD9AxLw9W5prc8OAFN0X0z7pXheII9HdtHzvkINW+Wl15H2qu4Z2Pr9x8P1fElD6D3Uafr2CIP6s9DrYT6BPNeXC2aKMZx+r46dWBVRvn2DvKYcG9sxW9au3RwFPhHIguHWAovN4MYHD4/Qqhc9km4nNHSKV7YZQFqDUEiUUzIJCQXXIIyUUFS80xGxbr5FuidqegX4+yA2bgWy0LrQ38m1lMBPQj8JEk2HT4RssznYdF0Hy6Y0WnhZDGxkNs58ybXchEPCPLaf4pAwAG1ZRNuFDwJPmvv4bG0Nl7Qn5yI94tiYcYmfLq/ZKBaZnoWJdnWdHB+UrXehDaW3ch8R1MdvEKbgamjxReXXrzy+dpMs84Crdzc6YE9gU0g3n8R2CVbu0VRYIPWZVvbN0wE4CnZW0MPMJCx7s8HSG2W1xee6suS+rohMQlZ0Dz0f5/3YL5qay+0P26wE002kTVMqSdkif7G3EzUwyFvQTj72TZR4ExLOkLDSjZ1FMa3TOc+jEDWWmBvOXFGN/Ksyc9OqsDHNulNslBmn7oYIncCy/3e3/u2chBozSsVcUxsHjAiBcrZvryQoDz9ZzjxInIbMmFk1bJo/68Y0d/CIaJSj/8xwot7c3wqoMN4Z158KjFG/X4AsQcqvfAP0GC9PG/EioUVjv2n4ppZ2+pUctmO0nrsbumbhZz2IYF0HCziIeHcGjUCcmYoeZlwxaAqjStErBGbfeie3sEmi2f+qsjeGHXg3XMeqh5HrHkwqFuDZUq7PKIhUyM1DUhisraGc7Xlr2OnRny8MqZN1Rz6gwvwq/7JCDjqKxbRS4FpbjUuIrm07t8aYiOHRhurllT5Pi6VJ0PmUIeidGy8db7yERK21O/qu1iXg8anSgcKKKhDx1eZUx12FiYuWEChzeyzScdbXI+NqVaiidb3pHEEIfeii6A2EukTOWzdVSg2ZKqY3m+nGSyIeTONWW9MECwsFZrppqz2uMeioIg1BWS8KfOOCorRaRxUhi+3f3ctlqBNM0SFFU7ZC0Jgx+G5mY40MaXuu9Jo4y9CEjqmfyp2McaXHVztvccd/b9cw5a20mPap8VEjDU9BY7qp5Yk8rTMFAFPpRNg6RGPUJksvyX2Vo4ru8Uq0s42+LEWCstSH8aatANWmauIIicqqylGLKc6Qvh/eP4MsCQsNQ4rVpB7jOoAV3LrVguUbwqxpryfLfxmOmLcWgV6mHU9j/+aaSKPdwMpdFOefu7wy1Ol8mVzoNkS2nFmPTjuYlNiiCKh/np/wdrHK5XJidEHOlychL6kIztLSW9AnJo51wrfwgRruoiF4P8Q+od/WIU9ma1q9GRYDaQxC+c8ySTEOdk= rak@demeter.rak.ac
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmS6v3S9B7VMsWspRgFldZUfPVwQ3PysUywV+uCAF6J rak@asteria
+cert-authority ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgOV5atVQfbpFQ2R1wkUPy2yoCxzloVMTwUU6j7R4v3 rak
diff --git a/private_dot_ssh/config b/private_dot_ssh/config
index 7889e90..a9ef846 100644
--- a/private_dot_ssh/config
+++ b/private_dot_ssh/config
@@ -38,12 +38,14 @@ Host puc people.ubuntu.com
 ## rak.ac hosts
 Host hades eos
     HostName %h.rak.ac
+Host zeta demeter asteria
+    Hostname %h.home.arpa
 Host hades hades.rak.ac hades.home.arpa
-    CertificateFile ~/.ssh/certs/%L-%h.pub
+    CertificateFile ~/.ssh/keys/%L/certs/%h.pub
 Host eos eos.rak.ac eos.home.arpa
-    CertificateFile ~/.ssh/certs/%L-%h.pub
-Host zeta
-    HostName zeta.rak.ac
+    CertificateFile ~/.ssh/keys/%L/certs/%h.pub
+Match final host="zeta.home.arpa,demeter.home.arpa,asteria.home.arpa"
+    CertificateFile ~/.ssh/keys/%L/certs/rak.pub
 Match final host="*.rak.ac,*.ryanak.ca,*.home.arpa"
     UpdateHostKeys no
     UserKnownHostsFile ~/.ssh/known_hosts.d/rak.ac
@@ -72,7 +74,7 @@ Host sdf
     Hostname tty.sdf.org
 Match final host="*.sdf.org"
     UserKnownHostsFile ~/.ssh/known_hosts.d/sdf.org
-    CertificateFile ~/.ssh/certs/%L-cert.pub
+    CertificateFile ~/.ssh/keys/%L/%L-cert.pub
 
 ## Misc hosts
 Host republic republic.circumlunar.space
@@ -104,3 +106,6 @@ Host github.com *.github.com
 ## Global defaults
 Host *
     ForwardX11 no
+    CertificateFile ~/.ssh/keys/%L/certs/rak.pub
+
+# vim: set ft=sshconfig:
diff --git a/private_dot_ssh/certs/asteria-eos.rak.ac.pub b/private_dot_ssh/keys/asteria/certs/eos.rak.ac.pub
index 5599a53..5599a53 100644
--- a/private_dot_ssh/certs/asteria-eos.rak.ac.pub
+++ b/private_dot_ssh/keys/asteria/certs/eos.rak.ac.pub
diff --git a/private_dot_ssh/certs/asteria-hades.rak.ac.pub b/private_dot_ssh/keys/asteria/certs/hades.rak.ac.pub
index 682478c..682478c 100644
--- a/private_dot_ssh/certs/asteria-hades.rak.ac.pub
+++ b/private_dot_ssh/keys/asteria/certs/hades.rak.ac.pub
diff --git a/private_dot_ssh/certs/asteria-cert.pub b/private_dot_ssh/keys/asteria/certs/rak.pub
index 5a4beff..5a4beff 100644
--- a/private_dot_ssh/certs/asteria-cert.pub
+++ b/private_dot_ssh/keys/asteria/certs/rak.pub
diff --git a/private_dot_ssh/keys/asteria/id_ed25519.pub b/private_dot_ssh/keys/asteria/id_ed25519.pub
new file mode 100644
index 0000000..300667b
--- /dev/null
+++ b/private_dot_ssh/keys/asteria/id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmS6v3S9B7VMsWspRgFldZUfPVwQ3PysUywV+uCAF6J rak@asteria
diff --git a/private_dot_ssh/certs/zeta-eos.rak.ac.pub b/private_dot_ssh/keys/zeta/certs/eos.rak.ac.pub
index 0ec9d2c..0ec9d2c 100644
--- a/private_dot_ssh/certs/zeta-eos.rak.ac.pub
+++ b/private_dot_ssh/keys/zeta/certs/eos.rak.ac.pub
diff --git a/private_dot_ssh/certs/zeta-hades.rak.ac.pub b/private_dot_ssh/keys/zeta/certs/hades.rak.ac.pub
index e554797..e554797 100644
--- a/private_dot_ssh/certs/zeta-hades.rak.ac.pub
+++ b/private_dot_ssh/keys/zeta/certs/hades.rak.ac.pub
diff --git a/private_dot_ssh/keys/zeta/id_rsa.pub b/private_dot_ssh/keys/zeta/id_rsa.pub
new file mode 100644
index 0000000..5818228
--- /dev/null
+++ b/private_dot_ssh/keys/zeta/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19fbfGZB+uadDcY+9T0kc+IzpVxZCSD90jgQapU2293nkbGmfxR0FGvzxGSM2puyXV8ds07PGL/HE5lmNpc9FHrtK7VDg8nQk34XdGCKbWLglzRn3vkLr1VqjmVbTw/c5jGdK4WcItsiz5prMX9JQwHhfbq1UhwaVz/Kj0+tlTO9zRBERPd7fCkNoi3SX0Vc/1jhi1yup0BbwXCxI9VeTDcpmQ/Ikp8WYSbvz2L6kMFIqyclRWPiYuxLV40UXT1HHaUWRzqeTD+HCIaynklB40uRYYshu1RB1TtAxOJqYqZ0fLTsrOuMHzQChix7Q/FG6fw5KTAD58po3niDotJSojczWOZYYI+iDA41iYRfq82e+CpTcjlGm53R5lWGeqLgdFn3nmGXsrP98SjQy8cFo2EPvmgvKpyfY1Owbgz+zVFyjNsRKJ4xHLFGK+Cmp/1Nx+tDJmDgiV46mLnkHmTyLiadUSAbeVwREUTtFQfOqUPmb08MmolSvPS9orjmhz5EeeFoUmPP4ThnrUDT3ylR12P5HstyFLqoeslujUeT2/nSPWOIutmas6eT2F34zaqnD+ue/F/x4f7rk4jN4cp6BFzz723/0YOHyYv3tJB49hYmCXDmtTtrouvMf2ozNE64Z02uu0mNV7vjnfA7ciXQTo1zwkpl8+UPwuX0xiqA13Q== rak@zeta