From 74dd0ce041224b21c73cd00a20367f68fec2d3e6 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Thu, 24 Oct 2024 12:33:33 -0400 Subject: [PATCH] refactor certs folder --- certs/gpgkey.asc | 29 -------------------------- certs/gpgkey.pub | 1 - home/config/git/gitconfig | 2 +- keys/freya-gpg.pub | 28 +++++++++++++++++++++++++ keys/freya-ssh.pub | 1 + certs/non-guix.pub => keys/nonguix.pub | 0 {certs => keys}/sakura.pub | 0 modules/freya/system.scm | 8 +++---- 8 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 certs/gpgkey.asc delete mode 100644 certs/gpgkey.pub create mode 100644 keys/freya-gpg.pub create mode 100644 keys/freya-ssh.pub rename certs/non-guix.pub => keys/nonguix.pub (100%) rename {certs => keys}/sakura.pub (100%) diff --git a/certs/gpgkey.asc b/certs/gpgkey.asc deleted file mode 100644 index 8f49ae5..0000000 --- a/certs/gpgkey.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEZOu3hBYJKwYBBAHaRw8BAQdA2vMy2QY03GrTkJ5u+1933D28aJWSqFLy3vPV -h2PotU60IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCAA7 -AhsBBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEET2vBHOuy8kIUuQ+sn/aTe4Ke -VloFAmVA+KsCGQEACgkQn/aTe4KeVlqGWQEAmm53JKWNP/EqvyAPIZG6mg3YAT5n -Et0dvaf5oBD2Ln4BAO6Q+y3T1z7lVgPQ9/6ZbEs6B71d4j7r2BpwcW1JYcUAuDME -ZbQwJBYJKwYBBAHaRw8BAQdANDr2TS2dtdDDNjRErbREUhlWUBb5no+m+jyY0/1m -UIyI9QQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJltDAkAhsCBQkB4TOA -AIEJEJ/2k3uCnlZadiAEGRYKAB0WIQRtx1BmlDfxN0SCiq50SrgA44OuUgUCZbQw -JAAKCRB0SrgA44OuUhSxAP40Z0MxS2rCLveOECqaFw5iGPxuj2/vJIwPEKuYGIS+ -yAEA8nqcirOU1Gz35/wOohc9lAApWt0FIrsdO+aLmtoAvQzlOwD+MOjKtIbn8vZl -NiAX7L+tBlH+GMDQb4dnQB5ZD1LWqgMBAMor6ZVHFh/ptQeihIWcDRpo9j0vf1X8 -21EVnzNmW3ULuDMEZbQwMhYJKwYBBAHaRw8BAQdA9K8LXdWBm4/jSRY/zZ+e62EP -qHadeubm5GCJxk1JFMOIfgQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJl -tDAyAhsgBQkB4TOAAAoJEJ/2k3uCnlZaH14BAM5rlzk6SyYw/RC0WV8TqNrsEhfF -4vrmVlGAM7pSuEAzAP0XCTglAX0gOqD5tfFGEg7YD2Vzec7TBsmR3Tlm68rKCbg4 -BGW0MEISCisGAQQBl1UBBQEBB0BmIRgbKdHNE+LJyvcchhcYkSvJCAHPTBq5zSbn -151dYAMBCAeIfgQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJltDBCAhsM -BQkB4TOAAAoJEJ/2k3uCnlZaWCQBAOhUcEFvQlDsGgk8uCu/VUJ0WF+WUKEE1fNO -aELmCNRZAQCGrmtATHxJKbX0kzIxEmRti9knTG9z9pU8f+4E2i0oDpgzBGW0LwcW -CSsGAQQB2kcPAQEHQOXmMS+5LUmgP5hnW8es2lYVpCxEVGhtB0Oc0O26Uw2RtCFG -cmV5YSBNdXJwaHkgPGZyZXlhQGZyZXlhY2F0Lm9yZz6IkwQTFgoAOxYhBLc/ajyD -s4yQM5eA4F1n9JmDex1gBQJltC8HAhsBBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4H -AheAAAoJEF1n9JmDex1g0ZkBAI3EHj3JeVENSHEoOrTwp3s7CANt0ix+3t1BFZ6X -nGoKAP43LCopn8+bXdjx/OhTbQi7bzBatc7c68O1KgkAV4olBw== -=oGkO ------END PGP PUBLIC KEY BLOCK----- - diff --git a/certs/gpgkey.pub b/certs/gpgkey.pub deleted file mode 100644 index 9d65528..0000000 --- a/certs/gpgkey.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPSvC13VgZuP40kWP82fnuthD6h2nXrm5uRgicZNSRTD cardno:24 409 474 diff --git a/home/config/git/gitconfig b/home/config/git/gitconfig index 0260067..188eb43 100644 --- a/home/config/git/gitconfig +++ b/home/config/git/gitconfig @@ -1,5 +1,5 @@ [user] - signingkey = 4F6BC11CEBB2F24214B90FAC9FF6937B829E565A + signingkey = D9AF0A4209B7C2DE11A884BFACBC553660D9993D email = freya@freyacat.org name = Freya Murphy [commit] diff --git a/keys/freya-gpg.pub b/keys/freya-gpg.pub new file mode 100644 index 0000000..0799334 --- /dev/null +++ b/keys/freya-gpg.pub @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEZbQvBxYJKwYBBAHaRw8BAQdA5eYxL7ktSaA/mGdbx6zaVhWkLERUaG0HQ5zQ +7bpTDZG0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCgA7 +FiEEtz9qPIOzjJAzl4DgXWf0mYN7HWAFAmW0LwcCGwEFCwkIBwICIgIGFQoJCAsC +BBYCAwECHgcCF4AACgkQXWf0mYN7HWDRmQEAjcQePcl5UQ1IcSg6tPCnezsIA23S +LH7e3UEVnpecagoA/jcsKimfz5td2PH86FNtCLtvMFq1ztzrw7UqCQBXiiUHmDME +ZxpY/BYJKwYBBAHaRw8BAQdAqxOoScBHGwsgHibO5NYxkl5f8QeIXsIFAM20KVM/ +Uo+0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiQBBMWCAA4FiEE +2a8KQgm3wt4RqIS/rLxVNmDZmT0FAmcaWPwCGwEFCwkIBwIGFQoJCAsCBBYCAwEC +HgECF4AACgkQrLxVNmDZmT17+gEA2QbrA+SQmgAtEwgdlQSRsdK8tfboTBnjeW9T +2j3ArW4BAJetX+1Q6pPXP4FLfZOz0Vu46JCy4DDGS37B89bmgrMOuDMEZxpZzRYJ +KwYBBAHaRw8BAQdAWf1SdS6rK+hXbEcjb0jy+bO9cDhna1khYRbsKcSDqfiI9QQY +FggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnNAhsCBQkFo5qAAIEJEKy8 +VTZg2Zk9diAEGRYIAB0WIQQ802XwNzzrE4U69WifvG/9bS2/FwUCZxpZzQAKCRCf +vG/9bS2/F2DHAQD11yHJC5VlyNtgPyA9SYI0M8clQjldB7O29v8gRGzbIgD/U4Sm +GnuRk2js5ITMmBdG1RGzEmmD1dVNIGGM4FiWdg/fSgEAy6dq/LVYeFRkMJ+Vbb0E +gFD7SnB/PNfrgtR6VS2KWCYA/1v6bblMoT5rNjcSt0i88SPo9n8CXDui1TOoPwLg +21EEuDMEZxpZ5hYJKwYBBAHaRw8BAQdA9NmEhp63hLFv2ftb8sl7OpvleaABdbON +L3TutR166SqIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnmAhsg +BQkFo5qAAAoJEKy8VTZg2Zk9iQkA/iUIRSGElTdKPALKQ9Laf3xgsreEYE25zdAJ +VtvDXd/MAP4/vjrNyFw6k7EPrIx+i9Stw6hPxChH9SwgjcgZdCjWB7g4BGcaWhcS +CisGAQQBl1UBBQEBB0B3JswDVPoc4B5BRt+XNZ4Y+2cT+mzJwBvEeqdkgrJHTgMB +CAeIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGloXAhsMBQkFo5qA +AAoJEKy8VTZg2Zk9rCIBALM+gv1wcpOzK1AHj2Nx+40Yf3Y3en7Py93lDK/iyWOo +AQCP9rp0XHMqNjiPStbV+cX9dgJym0L6tpuw55sSpWyIDg== +=fQIe +-----END PGP PUBLIC KEY BLOCK----- diff --git a/keys/freya-ssh.pub b/keys/freya-ssh.pub new file mode 100644 index 0000000..fab26a7 --- /dev/null +++ b/keys/freya-ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTZhIaet4Sxb9n7W/LJezqb5XmgAXWzjS907rUdeukq cardno:24 409 474 diff --git a/certs/non-guix.pub b/keys/nonguix.pub similarity index 100% rename from certs/non-guix.pub rename to keys/nonguix.pub diff --git a/certs/sakura.pub b/keys/sakura.pub similarity index 100% rename from certs/sakura.pub rename to keys/sakura.pub diff --git a/modules/freya/system.scm b/modules/freya/system.scm index 5873d01..395cb29 100644 --- a/modules/freya/system.scm +++ b/modules/freya/system.scm @@ -225,8 +225,8 @@ (service openssh-service-type (openssh-configuration (authorized-keys - `(("freya" ,(local-file "../../certs/gpgkey.pub")) - ("root" ,(local-file "../../certs/gpgkey.pub")))) + `(("freya" ,(local-file "../../keys/freya-ssh.pub")) + ("root" ,(local-file "../../keys/freya-ssh.pub")))) (permit-root-login #t) (allow-empty-passwords? #t) (password-authentication? #f) @@ -243,8 +243,8 @@ "https://substitutes.freya.cat") %default-substitute-urls)) (authorized-keys - (append (list (local-file "../../certs/non-guix.pub") - (local-file "../../certs/sakura.pub")) + (append (list (local-file "../../keys/nonguix.pub") + (local-file "../../keys/sakura.pub")) %default-authorized-guix-keys))))))) (define-public %desktop-freya-services