nixos/sops: add jayjay key

remove ember's key, since the E subkey is expired.
voc · Oct 25, 2024 · 7d70013 · 7d70013
1 parent 514ab7b
commit 7d70013
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 56 deletions.
diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml
@@ -10,16 +10,18 @@ creation_rules:
   - path_regex: hosts/tel/.*
     key_groups:
     - pgp:
-      - *admin_n0emis
+#     - *admin_n0emis
       age:
       - *admin_keepass
       - *admin_hexchen
+      - *admin_jayjay
       - *host_tel
   - path_regex: hosts/mail/.*
     key_groups:
     - pgp:
-      - *admin_n0emis
+#     - *admin_n0emis
       age:
       - *admin_keepass
       - *admin_hexchen
+      - *admin_jayjay
       - *host_mail
diff --git a/nixos/hosts/mail/secrets.yaml b/nixos/hosts/mail/secrets.yaml
@@ -8,43 +8,41 @@ sops:
         - recipient: age13yl99pyktjyssdm487pa5ucm4rxcrdrt4lq8qk2vkvdwyfhcvahqs4e6cw
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkWHJMMlhKaEQ4YmVyeXhk
-            dzVmUVVlWlVoWDlZclc1SnJWNXpLc0ZtY1cwCkMxSWJoZTZnbWNCdVlUT2hrNFA2
-            Mmd6Z1dVakt6anhIcUJwTGFQL0RyeGMKLS0tIFJ5RGJtL05PYXRpSHVheG91SC9u
-            NEZzRmRvK0Y1cGdBY2R3VmcrRDd4RHcKrpHJw+alI1AGgCxYfuFt8lx5cyOjOEPk
-            YhCppTO3JSoVb3UNQQsnVyYxL/kd6uANdpEGLAHs5f+fZUUwhAoofg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCcHVjTmRkWVg2akJOazli
+            VjNEcVQ0cWNjYjlHZ1I4Mmx6NHNEaURHSVJZCkUyd2NobkNSSml3ZHZ4UWlYMWFB
+            TTVRMTg3TTlPWjNsRllKQ1NkR1NvcVEKLS0tIHpnbDh3RWVlVWxQekpNQ1lsY256
+            RUJYL1IxbGVNT2p6b2dwc1pTbmhWQUEKf+gBxG3qUilQ3EIy/VN9HZap98glvkoy
+            Rm432192/a0hRxyPQjonCRFlvaqA5g6Pc6/FiCE/JVmGqhZuWwBivQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1wvtkhug4q7fcs7wz03kpn77ruqkkwp2xqq30npv4287wtf3w8ukq370vre
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3SEtaQUZGSVMwTC83Qll4
-            b1ZvbHdWNGFqOWkraUFTd3NFZmZ1S2piRVVZCjE4TTJOLytYay9uUnRlRXZXZ0wv
-            VzJwWnhIQ2hZUmx0NUZvN0tSUVVCWkEKLS0tIGUvQ0MzNzZ1QkpwMno0RW4yVFVh
-            enhrb2lGeUNXVVAzbTB1cEwyYkJucTQKsALbl2oTLzjOaKe/bQ9xm2BIbdNNuYmY
-            qFo7Ve7Zhzl1+uxoSmrt5weDz/1XqWzLxdJveIDQjJ7mI3er/jWgKA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRNS9HU3lWS1BwekxLZklh
+            SDZYblN5QTQrbGtUWTRsdythT0lrYkIwUHpRCkgyZUpxckdoY093d3JFQzdXU0c4
+            MzBCVXN4TGNEaFFycXMxbXJocThUVDAKLS0tIHhwZWxqaUJyNXlscjVqeXgyb1Zt
+            ZW9tS1A0enR3bEdZQzJYeWR6MTRQUVUKI1b1helBqsCCeDiluy21mNBRx6fXcGdp
+            oLoAShxIsoj5OSbzCguBTW+H2GSdMyOGMDzuRkKWQhieFvPyQKAyaQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1yyxdtt7lpcm9hr0y76g559yq4uqz8e8hjc2fzqtwnhctsj99fp6sf3ksl6
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvdUFsamYwa2w3NlFjR2tH
+            NTZzRkZTSHFiZXdzUm0wTGdvZW4vMThHQXpVClNvdWVIekp1akEzbVZNSDcrOWx4
+            WHJMKy8vbUgvem9PK0lmQ09zODFwK3cKLS0tIHZlMGdJWEtDNnVBR2REcDRHeHg0
+            TWc3U0Jub2d2VjhJUnBCY2NlYUNqUnMKx9C+EeLk2C0DzW4T/fUCDwU7NZca+QmR
+            B+Suc9D7Wyl1/LM7mrBSqbayLK4dK/poaGKpQhkAHRvMYuU6V8mmUg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1zcj3dt7uc3gc3kyt6l7m86qjzm9vlgq7kcsm9wh9gank6rqff4gqwrtzpa
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFR0d5ODk0RHQ2dU8zMkhp
-            a01nUlNJOXMzaWU4S2JmZnJhcDNCZ3grL2hnCjFnT2FodnZvRXpwM3RPY0c4VEtE
-            NFdBSklDTStyQnVKNzhhUENZUG1YaGcKLS0tIEJQZFRrYXBpbmtLVW5tZmdSY2pK
-            Ym8vdkpuSE9CWXc3bTA0ZEFJU2tGTmcKaZUfLxIaA87t31lZFBX2+uU/lPQTpJHa
-            YwUWc1HuG+gltUe0pisfCY+c1sUQcrqOrb8Mr5f2qoCkMBPT3PKk1Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2WVVyOFdCQ0xBYVJDTTFl
+            c29nQlZRTVYxS2pYc2VFQStIMDUrZFRVM0dZCnFNVWx5MjhHbkVKZFVHM0lGc05J
+            R0U3Qy9rS0laWlJEcElhZlo0ODQySk0KLS0tIFg5ekFKa0ZsdzBFMThsL0tidzIv
+            ZjVMYmZwc3VaVEFWK2lUWkFwMVZvdWcKlXTAKuQZGBrgJGF+tCDqCxY0aFv4oBwz
+            WiNp7A4zlAXOq7P8S4FLt2b472LnFiBsdFShQpnSWIecIMwn9HhnOQ==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-01-30T20:48:28Z"
     mac: ENC[AES256_GCM,data:w2ohx6aWE30qAN4yXl7DttJiW1U7MVp0/Yd8SaHgW9qTypsFg2n1S1LPqikVbpwuz4JldloD+b+sC7WKCzGbLAMgMvZBeyMQAR7sFxq4Ocwl6IgHY38PD2QIQpWEp2cdaGjPKt9LOgWA2Ox29f1/XrZoom0Q6BaTHyr47BNpryE=,iv:2/BMIce8PXsuOcuE+Wgd6ymeR+Km18MecIy2yhrb1YQ=,tag:lwn+/VmVf9P0gZCPA1m7SQ==,type:str]
-    pgp:
-        - created_at: "2024-01-30T20:24:32Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            wV4D6iFd6webPCUSAQdAM3fgJ4aUC6g/ukbDv6rjnegCc4FOE2O2eEeBYlron0Ew
-            wOkMW+gBnO70y4RHq97+HQOdo3FAc5XQQa8DkT7g3v6dsBbQoieFSXjcYqXi3o7p
-            0lEBC2XHHvsrsmw+eOKucDKuja/Uw+RxRq1n/OfMITv+5wxuj1Y4AJ34Nj8Z2bZp
-            74CQFzp9duZ3RO5x8/K325j3LT1F6nIxBR/65AhSOys+LjA=
-            =AHzk
-            -----END PGP MESSAGE-----
-          fp: 6E10217E3187069E057DF5ABE0262A773B824745
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/nixos/hosts/tel/secrets.yaml b/nixos/hosts/tel/secrets.yaml
@@ -12,43 +12,41 @@ sops:
         - recipient: age13yl99pyktjyssdm487pa5ucm4rxcrdrt4lq8qk2vkvdwyfhcvahqs4e6cw
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsZytlNno3VHQ1MFVjdmth
-            c2RrVkFlZUFsei84czJhUWNkZ1lIakVKMkJJCnVjYlJiN0RYbk45YmVISUtQMzFN
-            dHo5YWFZMW9FLy9oMmNaRFVZQXlueUEKLS0tIDBtRWY4NWVHY3puTk5xeUtvMHBB
-            UFppSmhmb1Q4Q3lrdEgrNVMxeDFoMDQKdB3LSZlYjWlxuR8xorAXlGLxZm0O358B
-            D7iWi9RTSC9xtiyeMwugMh/40FUFXZUva4gFMjyUtFzr/xsMsYphBQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByUDZNQUxFK3p6WmU2N2h0
+            RmlZWU41TktMTDlhRzc1SE9KUU95MndlK2tJCmVWYzhNTk4yTlFpSkowZis2OVF4
+            ZmhWR1d6Szk3TURaMmV4dlMrVG8yYVUKLS0tIFJUenA4eVY2RHkxZUZDUWlvUU13
+            TjJKck9NdFhVdjJBVFg3dVlFZ2tEWmMKwAe1Lxur42+FOIXE2yC76TZ99zmrTEmq
+            kDGjppXqfOn1O3q9zggF27WoXhdnQHdbE133qc6/AP9Rjg4EzbbhDA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1wvtkhug4q7fcs7wz03kpn77ruqkkwp2xqq30npv4287wtf3w8ukq370vre
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzWVpQZG5ZbDlKLy9PSEF2
-            Y280NU1iYlBkMVhEUnZQVk80YzdOWTNBU3d3Cm5ZMzNxdnpxR0dqQ3c3VytzbzVR
-            M2QvSVlKVmNtMDBQcHIvWVQzV0xiNDAKLS0tIDlKRDdMRi9OTWVwR2NIdmhicHdZ
-            MCtnY3d6c0ZtNWdJVHA4MzNhcGNyQVEKQzT7HRn8IVJCy/Rdk/oW5AhNWxOtt1Xj
-            /azL2t7YSxqHSjETbpP1/uHO+rK33Ccq/UqQHO1Rf5N7alrTrxNaHA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5U2J2SXdIaEpBMFdRWi93
+            dmdWNFZjMnIxRlVKMGN4ZWhlOUtvdmdRWVIwCklFR3E5TTZMNUtWTDBPWDJoUGlk
+            Yy8zejJpRFFpQy85YjFZcEZCZXB4VVEKLS0tIEFpOU1WMSs5aFE2Zy9PNE1vc3ZY
+            WC92V1F2azcyNmhBMDNuSzhpTGhUWm8KBCNhiWNv3onGJwnx++ktqR9q59fMLr5S
+            LPahR2F+M2/dzZNRxf63JbFeQD+kYsgSi7W8yh1EYauvInurUbWWzA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1yyxdtt7lpcm9hr0y76g559yq4uqz8e8hjc2fzqtwnhctsj99fp6sf3ksl6
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwQzVJMjFYRTlIMGJYOHk2
+            THdFTThRNW1EeE14TTl5a1lNZkg3NlBqZEJzClVjUUFpTVdxRkt0Z1pmS0JKTlZ3
+            eWNwbVFwWUNzOVJkdUVmYWtobzZnWVkKLS0tIGUwS25pa25CTzdGNkE2dXdrcmll
+            ZGl5SGQ0WC94RDN0QU1EbGdpakNQZGMKoVA3QKE5cb+xDm1+uIoZ5c0MiOyseUnA
+            V62NVdYLLwBAi2LQuuwZtIPdIA0UC5gwxvaJYXljPaMGFiHqXV/7lg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1glkmsh6pex9g5v95vwx78a8xksmnkvsu7ccnhxzu09yvnfnjudls3lfkru
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuWVdyN2w2WmZWLysxMjBO
-            N241WGNwcTBWV2t5Z3NBdzI3YUhtUjJpMkJvCjdyMjdEVHZGQU5qczE4Nm40MzUy
-            Uk5KY2Zma25BQWt5V0VLVTNLR2lsblUKLS0tIGtFd0NoNkZFRms4Y24wOFI4bWNl
-            bUhZYlhMZDN6Ry9hNTV5b2c2N2c5VzQKbSOFOEOlJvzGjEZkwAZb2WA7YcwGQcYG
-            FtsTVvv8BmtgpJT99tIfrnbA55vjckeN8SFD83x5pbjk8kaM9S+law==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIRSswR3hkMFAyb2p3a2J4
+            aHkzNUVtUHAwUnFKMTZDSkhOcmlDSGlybDAwCmFjK0JFWTlhY0dXS1ZKVzVRVzF1
+            dk05N1lEZVVrK3piOGdETHAydjRZdncKLS0tIEQvdENZRkl2LzdWRGE4R2l5L092
+            Z3hTb1Rqbmk4WmdCZXh4eTdvc2FXcWsKd/ARlPNkrXrTfriit6oCzN+CCeBOEBo0
+            olvi6/4uO8J6g9Es7Z/hwPJ0RfKlB4IrpdNuEr7G8tQ24594p0k81A==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2022-09-30T14:46:18Z"
     mac: ENC[AES256_GCM,data:UqJqDqlBLy0j3e4+FBcnxJnpPAlAf6OKsiRhvY3cjfU88IcMEEq2CgFBePrsEQKUMifyyYl0G0Z6qqZxule3mEkTKZePvGNlEK+yREow6SoCydxOZ9+bZ7Vgxi3jmw/dq2MpmOmoJKXFRzrKyvqbEt3CiZ1cNi80kStNyO63F6I=,iv:FGRFVayQNBMmOOpMimC4oVar2BX9iJEV/stQW7pg0bY=,tag:wD6xKN3vTWPb8n/XccFbFA==,type:str]
-    pgp:
-        - created_at: "2024-01-30T20:24:39Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            wV4D6iFd6webPCUSAQdAm1jHjCVZ39lBJeO0S4EzWv7UptI54vBoDa0fIGc8DyAw
-            Urq6NefJHU/2tvoyCqv2sQmv5aGv0VS0GQpYpbCQOYgIEQDN34JcYQuzQ9qq+x31
-            0lEBKN43STLrVUB1suzaEj+W9f+4SvB+pf7AeCDW5l7K/svDs0RPWv4OkipfcVRk
-            wwuisKt1u71YNu6PRQI2UpI52L65qrTjKWoYpbKwZ8lfYqw=
-            =Upsy
-            -----END PGP MESSAGE-----
-          fp: 6E10217E3187069E057DF5ABE0262A773B824745
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3