From 5ef1c503f795d6357af770aa6f74d0fc50ad2cf2 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sat, 20 Dec 2025 08:40:02 -0500 Subject: sops: rotate shinji key --- .sops.yaml | 2 +- files/keys/shinji.asc | 20 ++++++++++---------- hosts/shinji/secrets.yaml | 26 +++++++++++++------------- hosts/shinji/sops.nix | 2 +- hosts/thinkpad/sops.nix | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 7c57903..f0b36a3 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -4,7 +4,7 @@ keys: - &freya D9AF0A4209B7C2DE11A884BFACBC553660D9993D # Hosts - &hosts: - - &shinji 2A8A27879715447AEEC59D0C18DCCBE353963394 + - &shinji 659C3533EF08B6EB0A81A777E9A11C12771D6185 - &kaworu FDD5D980CA2FEFF1AA8433B10F7CD7B91AB7CF01 - &thinkpad ED1C2FCA9DF4A843D740222A2320AAE969A6A53D creation_rules: diff --git a/files/keys/shinji.asc b/files/keys/shinji.asc index a54127f..c2ef480 100644 --- a/files/keys/shinji.asc +++ b/files/keys/shinji.asc @@ -1,13 +1,13 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -mDMEZ5PEshYJKwYBBAHaRw8BAQdA9+xyytloOTF23lyqyXuwQLxzEayOnMTg8/4Z -WkQZQva0M0ZyZXlhIE11cnBoeSAoU2hpbmppIGtleSBwYWlyKSA8ZnJleWFAZnJl -eWFjYXQub3JnPoiOBBMWCgA2FiEEKoonh5cVRHruxZ0MGNzL41OWM5QFAmeTxLIC -GwMECwkIBwQVCgkIBRYCAwEAAh4FAheAAAoJEBjcy+NTljOUONwBAJxKRllAFMp9 -gDxjNrYIChZdz4OssLuCTwRdJDaDPYkaAQD0QyWMTAOyEAmDOfAbVKEOvjBT1OKC -AuizXs8lxEdlBrg4BGeTxLISCisGAQQBl1UBBQEBB0AqLq6bMlO77JHu0pEluBHf -nURLnx2C1c2V+DEEbRyNVAMBCAeIeAQYFgoAIBYhBCqKJ4eXFUR67sWdDBjcy+NT -ljOUBQJnk8SyAhsMAAoJEBjcy+NTljOUU1gA+gOG/xzRisgItWABqBEfRk/v80cx -ztPaticmGWdSaBKIAQD1VI0iqy/BI0etk6xKPWfsLLsCOvy+4qfDliYL0oelBA== -=cXeC +mDMEaUamABYJKwYBBAHaRw8BAQdANj5XKEPVZRgiMiMUmxRQ8ia7fYzKNn/KX/46 +AVSd1JG0M0ZyZXlhIE11cnBoeSAoU2hpbmppIGtleSBwYWlyKSA8ZnJleWFAZnJl +eWFjYXQub3JnPoiOBBMWCgA2FiEEZZw1M+8ItusKgad36aEcEncdYYUFAmlGpgAC +GwMECwkIBwQVCgkIBRYCAwEAAh4BAheAAAoJEOmhHBJ3HWGFYQABAKkU1T8ukwQq +8B4WW8STu21NxegVWjo61G/8bAN7KARdAP49KVZt54y4Mn2TkJBWO7uhWZXoo+A0 +g8+FfHs0B/qxCLg4BGlGpmISCisGAQQBl1UBBQEBB0AuMjuaVX1Z2JKSCmSqUny1 +7eUQdDvsE+IZ8iGBi4VHFwMBCAeIeAQYFgoAIBYhBGWcNTPvCLbrCoGnd+mhHBJ3 +HWGFBQJpRqZiAhsMAAoJEOmhHBJ3HWGFZE8BALNih+F0+mPDQ96iGN/xV34Abtfo +Eo0q2ZgCJJ2KUVQDAP4wl5VzWuAlbscWmIYKTdWxeQfNPTtsGqg0dBNHdGXSCw== +=xMvz -----END PGP PUBLIC KEY BLOCK----- diff --git a/hosts/shinji/secrets.yaml b/hosts/shinji/secrets.yaml index 35a3277..00ae4ae 100644 --- a/hosts/shinji/secrets.yaml +++ b/hosts/shinji/secrets.yaml @@ -3,27 +3,27 @@ sops: lastmodified: "2025-08-23T18:29:46Z" mac: ENC[AES256_GCM,data:wFWETiGqtmpF87zLdVdDeEgBYHxGMYN9GGWW+wBIK/otcYjoWWdqhFtqVy4t7Xpxs63J6U3dELQUkIiI7voGxoJRMWiK3txNy2GCJUG1eL/XtlrANy6FXDtuRh7bmn/VE23Xhagzz3qAFXElezOLFV7DNCBDrLj0TqfdbN2YzXg=,iv:9WgJDFwhtYl2IRn/r0X3ZrTBAHqQ5ADeDKaBii8nFIw=,tag:PlqRvyIjFbFQxgNYI0cYZg==,type:str] pgp: - - created_at: "2025-06-22T02:32:57Z" + - created_at: "2025-12-20T13:39:42Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4D0Q846mnV8HYSAQdAiydHrfiuvIlOIMBqpPWX/05MP5d5gIQjXIyc8tzdsycw - ZzzKJKsNh4XZd726Toks0CVF5NZLYLtMyAs8S2huf3gz6cgt3k8MI2qPmaEJMDBQ - 0lwBjTp5//gCK0YbO76IxvteL+TgiklwJN03ryMl9Mj8JVVMmiBh25PGuxblbi52 - pEJMVlxJVUxrHQY+XREZKhNp73JLRovZHFDMpSR5TAZxD6ZmtChElk5ofKVFiw== - =suGj + hF4D0Q846mnV8HYSAQdAPREkd2Tn0GK35m1+gJv/Vm6qhnrysF+ORJZKBGvakQIw + UbDN6oAFS0pli2fE2k6ogKUFK5Nnzwc36BNxfzR455YE7zju6rvhOXHw70n+Osn1 + 0lwBWplqmEtmXHTI0hfXrWp/xHPNm4kvU7atggYCXRgbxIcICF/ZOcw4A0qGcwdf + kVUczpFcrTmjFyyt6Ho+kbb0zNsGNSz90w+Bc2KCZMSbp28eeN9sUXx5UAHaFQ== + =EkCv -----END PGP MESSAGE----- fp: D9AF0A4209B7C2DE11A884BFACBC553660D9993D - - created_at: "2025-06-22T02:32:57Z" + - created_at: "2025-12-20T13:39:42Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4D/YCJcy0T0DkSAQdA3Vc35wBJSjwWaNbYa2s4wKGsXOnz6ucSk62vnXGxYTUw - Y8uSyG6Jf040oEgAixd46s1H30CmT0+Hi6zF7jGweo1yGzEFZ53v+VVusCv2JbI7 - 0lwB7LnU2M6SAkvhr/SJTEVz9Uu/cx6xJnFeGXWXwY6mPN+InOee7UJW3Ffv2n/t - 7PoojznXONSma2Xc8u3Ywk83jMrKqnNLMEATqnCg/1FZHe8Asr6Lan6KD0U81g== - =azav + hF4DZWdipPFpD5sSAQdAHnvyhLu0xa0f8xqBzAkJfVuh4WEYc7ExswVa3YFmSCIw + z+g56UmObSbn1dpov7afbgCrNxtGWcRz8jyxRk6XyLym8tmq6a0HiX8i2tm/+U4o + 0lwBd2gzmctSClZoQ04UcgxIKl5aQ1sHwMTcF7kcJ1ivNyqPEKUr8AWuc3JX4c78 + hHLSwJz44W+3MCTsDnq8KplD773CmFs2fHUQStVi6hLDZZOz09bWwxm6rxoSVg== + =WU5H -----END PGP MESSAGE----- - fp: 2A8A27879715447AEEC59D0C18DCCBE353963394 + fp: 659C3533EF08B6EB0A81A777E9A11C12771D6185 unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/hosts/shinji/sops.nix b/hosts/shinji/sops.nix index 1e46b6a..9169bbc 100644 --- a/hosts/shinji/sops.nix +++ b/hosts/shinji/sops.nix @@ -15,7 +15,7 @@ sops = { defaultSopsFile = ./secrets.yaml; - gnupg.home = config.homePath + ".local/share/gnupg"; + gnupg.home = config.homePath + "/.local/share/gnupg"; gnupg.sshKeyPaths = []; secrets = { diff --git a/hosts/thinkpad/sops.nix b/hosts/thinkpad/sops.nix index 1e46b6a..9169bbc 100644 --- a/hosts/thinkpad/sops.nix +++ b/hosts/thinkpad/sops.nix @@ -15,7 +15,7 @@ sops = { defaultSopsFile = ./secrets.yaml; - gnupg.home = config.homePath + ".local/share/gnupg"; + gnupg.home = config.homePath + "/.local/share/gnupg"; gnupg.sshKeyPaths = []; secrets = { -- cgit v1.2.3-freya