add klaus public key to sops

tiborpilz · Mar 1, 2024 · ae0a16b · ae0a16b
1 parent 8ddb0bf
commit ae0a16b
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 74 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -2,13 +2,15 @@ keys:
   - &tibor age1gzf883y8p0wfy5yjn5l3l2axnqxdgtw2zdcp8jqsrk65m7gf6y6qzgkf63
   - &server_homeserver age1xjx03xm8yqmnykcy6hdgtpxadhurtgd4r8vhtwsf2pks3zxsgafsycs5tq
   - &server_edge age1lqnlkxfkrfgctj22aj7qy02eyl696rtkaautwsuzwtp96ryp290s3drpx2
+  - &server_klaus age1vuxs3pjmsrug6t57zy5tsf3wm3cqml5ew6dfywkppzv52kchxc9sduy2wf
 creation_rules:
   - path_regex: secrets/[^/]+$
     key_groups:
       - age:
           - *tibor
           - *server_homeserver
           - *server_edge
+          - *server_klaus
   # - path_regex: secrets/[^/]+\.env$
   #   key_groups:
   #     - age:

diff --git a/hosts/nixos/homeserver/secrets/secrets.yaml b/hosts/nixos/homeserver/secrets/secrets.yaml
@@ -13,53 +13,41 @@ sops:
         - recipient: age1gzf883y8p0wfy5yjn5l3l2axnqxdgtw2zdcp8jqsrk65m7gf6y6qzgkf63
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDYzJDN1dRVXY3ektzTjh5
-            VUdGT3lSbUhnNHN4eDBiSlVrdm94elRYeXk0Cm9lQ0REeEJteUJMUjlUUUlYZ0hN
-            a1A5SmlHbDBQR2RPTDBaTHpCS0pUOXcKLS0tIGlVTUJQL1BDSytnZkJvQ09jTnR2
-            SStERW1jVXpXTXpWKzc4dE9DK25kNlkK75R7W8GwrtXVGlYfjOw2OJiJM1kJZy+U
-            c8imaPIY940oUJXg90jTplopWrlrOx4lwdNLOJ479GzsFM7iTK2hsA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzVlkwUVFKNS9ET2ltSGMw
+            aS9CSFdMK1R3V282cEJJTzhadURJYndyTEJvCnV6YzBSNVV2NEkwQjcrOWJCa0hI
+            VWdsUXRySGorSTZaUlV5Ym9hdUtSeTgKLS0tIFJuMnc1MUpPSTljWWpJN2tMM3dQ
+            a09XalgwZ28ybzh2QTRHQkxubGhvK2cKzYVu5exJ6x7zKjiswGGeM8jstt6H9xnp
+            RECTLwp5Ec+SLVEk6hZVW3TpXBV3AOwdBPkJjjawMw/7BAv6wDs/yA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1xjx03xm8yqmnykcy6hdgtpxadhurtgd4r8vhtwsf2pks3zxsgafsycs5tq
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3RGdCRFRkL29GT1VtT2oy
-            SVVSSllFNm13YWV4NWEvTTNkYkhxaTlwelUwCnEzZFN3cXc1S3Ftckc2UGNtOThv
-            QWdWOCtiVFNqQTlnZUcvblNRMEREdFkKLS0tIEhnMjRpREgweUtmdGVNM28yb0xU
-            aEJ6WW10KzV5ZnAySUltdlI3WWJpZk0Khap6zduCaIr9/SgGKHk0awqD3FvLA5uG
-            EXEwmcvwwp3uWMABHN7yYt5XLmy7X2W+zWVmikGUHbz+Z31XQuPSbw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHY3hteVpwclh0NStMWU5I
+            dld6cENqRmY1aFIzaHpDaW5xRk1KcnlWWGdJCm5Pd1ZnOUVQSmdoYi82THVEYXFF
+            aHZsU2I5OHp4Z1lPWDlBOEdvWXU2UjgKLS0tIHV6eWRFbkkxdmkrYW9ySHNaS2x2
+            ck1yYkdnZEVXZWM1MWlHV2pzVGhpZVUKGXdPCR1sDOuc5sO8ho/w402fILR+iG53
+            P31i5+HJtMkCCshGPGm5soa8kmENZAP/u3lPctnYLtUimVH8UAmYfg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1lqnlkxfkrfgctj22aj7qy02eyl696rtkaautwsuzwtp96ryp290s3drpx2
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcGEyU0t5ckZCYiswb25Y
-            WjJ5WGN2R0NLeFExL3daV29FbDloUDFTcFJJClZxZTdIaUlMTDZZNHlqVFF2NTdN
-            Mm82RUluZE5TR2ZkdUNpV29ZazExdVEKLS0tIEJoTzFtMktuUHB4N000Y29NaE1z
-            MnBYV3diNDhPRldQUDVweFp1RXFXQ0EKiv1ikXR9uNk5/KOZWAWk7fevzFmiACFi
-            OyW7tRs6FCk+IFnTHF949CZ1ID6lEh60R3JDGI70qGLaqp/TNMYLbg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLb25ibE9pRXc0WFlhY2hS
+            ZTFiSTFqYkx5WFJjbkRPWUpEYXhRWU16akhnCjZVSVArcm5aM0xHMTdmZllFVlFi
+            dkhGdlFWb1dhd1Z4dHp0ak5UMGptaGcKLS0tIGQzeDZCU3VyL3dxQ2NnYlpTUnlX
+            TUJhYzl4UlpWbjdWa1V5UTR0elhUdEUKHISGRxM0sgwqhmoi4C5fBDyuXW6N3Mgt
+            tLXTAQ+sE5lqvdVodOJfsqbilPubdcoQ7tsbeHltio+OOtHIegzevA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1vuxs3pjmsrug6t57zy5tsf3wm3cqml5ew6dfywkppzv52kchxc9sduy2wf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnN1EwQU5SbTlmdU9aaXpi
+            WXp2ZFNacmNiTVNpcHFpMW5Fc2IyRXZkd1RBCnduanRzcllaWlFWYllwM2JETmY0
+            V1BhTys2dXFqZjFSWEppVzVROCs3TGMKLS0tIHJCZytPbFllMUJNcitjRTQvV2Z5
+            T0ZwYnFiQURkSzl0Q3hrdGNVbm9CSFUKGnFc6HH7c5EEYHGr+UX4/7nTgBmMv5v1
+            X2AhbTGrdBG6nLfYTbTj0QbaaDAIiSmtZJFhl5SPLWk4R3ZPefrnMA==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-12-28T20:35:38Z"
     mac: ENC[AES256_GCM,data:kqRI22yDjXocdA7hu20ZZJGIyLQKRve7EuUvxOgtSUbtIUBvuueQK+HfLnHCbAx2NHdzSwKl3bN1FTsGok0NeWTMDCczedxqm88uD09039PNa5NXKrjtei/qJHxyUq8L796KtyzacFE8mOcziWxgatSJqZN4N/T3vSg8PhrLp3A=,iv:9AchM+2qLsMMxNFWrHK2ifQqUbz5ol4svdUwe5IDN4Q=,tag:8tRKyAr05qLMS0DreRCgfg==,type:str]
-    pgp:
-        - created_at: "2023-11-04T21:08:53Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA0IKwDTH3WibAQ/6A9J4BLBqnMsV3fvcxw7YcbDVmEEd5wAAcv93gP6LbrTu
-            6qXJjQuwJdq1hcD+gk2f2IPtYoMcjlRVJK6POL5ojlCpFcMmoRgzema61B6/hOvV
-            Q8vZPb7D1lpRoD9AlkMH3EVwiaHWhcp91pHLXFzttWNxddvLyCYFa/z6NwNBxcgV
-            mM4gJLSPIXPq273Xh35oti7B/CGyoHHyLRwx9BPmPTxbU+H0x038M0kWrNuRt5lK
-            7R+KBuGNuErdde9E3lgBYKRSB6LAUMWeQU4nYpJ4ILyEgxG68yLvXNWTlrbVI3Fm
-            ayLb7Q6I6SaMNvBtFs9+RhbCf9q5EYNqiGZdS62qKKkWP8dNCBThPTOn3VmtGGQz
-            xaizyEL2PlEjr0WuduenVvYP28eGBtzRpEmvO7/B/brjT9AoJ3il3Iw49d6HFHvU
-            xUvsHoGbpJMdkcmoXqEFItvahlYY1xmr2qaqj7RXtt09iw/fESQ03JU6TXzYHiFO
-            ifyP9Ms+vMzWjSGrjoF3/3MdPwkzKAJwEVGVnNiJNs8uJdRtodOiaY1ny2rmaTSB
-            mqlwQlQE0AqY4PUT1gb3sIJ3CldkaeQOyR35Lh2mJIF9yZMIAul43pkv7NaJWwzO
-            s17BGPwra6u5Mp9FliF0SwI4D7hK90bjCrIAjN1Fjpv+SqftqtspR9qNAB4VNiLU
-            aAEJAhD9cDlTpGBm6TrQy3JeFnY3WUAYRcTF4aDSWlXePygj7kaJPTmibd0d1bf/
-            f2DbLNTqOhuxneCqyl1zzD25uRXU2JlHlQfoOzHaaSnedeml0ly5iMbXeP3rM3/V
-            OullBXD/8t3P
-            =gb4U
-            -----END PGP MESSAGE-----
-          fp: 03746612698994281D322B09923BC5E9B4E9509B
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/hosts/nixos/klaus/secrets/secrets.yaml b/hosts/nixos/klaus/secrets/secrets.yaml
@@ -13,53 +13,41 @@ sops:
         - recipient: age1gzf883y8p0wfy5yjn5l3l2axnqxdgtw2zdcp8jqsrk65m7gf6y6qzgkf63
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDYzJDN1dRVXY3ektzTjh5
-            VUdGT3lSbUhnNHN4eDBiSlVrdm94elRYeXk0Cm9lQ0REeEJteUJMUjlUUUlYZ0hN
-            a1A5SmlHbDBQR2RPTDBaTHpCS0pUOXcKLS0tIGlVTUJQL1BDSytnZkJvQ09jTnR2
-            SStERW1jVXpXTXpWKzc4dE9DK25kNlkK75R7W8GwrtXVGlYfjOw2OJiJM1kJZy+U
-            c8imaPIY940oUJXg90jTplopWrlrOx4lwdNLOJ479GzsFM7iTK2hsA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3Tkl0MG9Sa0JpOHlGZlNh
+            dVBmeFp5WTVGZytoZGhyaXZQenI1U1JtTzE4CkE2a0VNbTVSSC94VUUvZ0I3a011
+            TUp4YWw1ZGNSNExNMzc4NjRDODI3MUUKLS0tIEQ3MENEdzVtTzAvMlpZazhoZkZQ
+            RUhSaXk3V2lRUFdBNi9pOFNQdlhZbUUKOfLhKszUun174Chw6D4Ol0XYW/cwgBB8
+            chDNDnqR9w6+90Vke25Ymrk8h7+nU2zT81NDvT5qklvRWUXfJR7sBA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1xjx03xm8yqmnykcy6hdgtpxadhurtgd4r8vhtwsf2pks3zxsgafsycs5tq
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3RGdCRFRkL29GT1VtT2oy
-            SVVSSllFNm13YWV4NWEvTTNkYkhxaTlwelUwCnEzZFN3cXc1S3Ftckc2UGNtOThv
-            QWdWOCtiVFNqQTlnZUcvblNRMEREdFkKLS0tIEhnMjRpREgweUtmdGVNM28yb0xU
-            aEJ6WW10KzV5ZnAySUltdlI3WWJpZk0Khap6zduCaIr9/SgGKHk0awqD3FvLA5uG
-            EXEwmcvwwp3uWMABHN7yYt5XLmy7X2W+zWVmikGUHbz+Z31XQuPSbw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqeEttU2ZUKzZXamxrdjVT
+            S1RZYk43Z3hHb1hFV3ZzMk4zNmxhRzJOczEwCnVycFpZZU0rNHZnSzVrSjZwdjA2
+            UUNQblZZVEcwVjhuRStLbC8waHgxTDQKLS0tIEtDcExMRGxrSzlidWFuVVZYakg5
+            MEk2bXl4NVpaSDI2eUhHMjNzeUlSeWMK0TfDu3swjoDwMMmP7Rv2ib4dUey8+444
+            fjwJByFiSdc2DcXg7KtxXgl6aRLQaPy8YNxQkj3S9orV8p5cVFdKqA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1lqnlkxfkrfgctj22aj7qy02eyl696rtkaautwsuzwtp96ryp290s3drpx2
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcGEyU0t5ckZCYiswb25Y
-            WjJ5WGN2R0NLeFExL3daV29FbDloUDFTcFJJClZxZTdIaUlMTDZZNHlqVFF2NTdN
-            Mm82RUluZE5TR2ZkdUNpV29ZazExdVEKLS0tIEJoTzFtMktuUHB4N000Y29NaE1z
-            MnBYV3diNDhPRldQUDVweFp1RXFXQ0EKiv1ikXR9uNk5/KOZWAWk7fevzFmiACFi
-            OyW7tRs6FCk+IFnTHF949CZ1ID6lEh60R3JDGI70qGLaqp/TNMYLbg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUenZTNTZzZUhjWGRmWmxV
+            VnVvVERPR21teEU5UVF5dHlEbTJiRmlVdTJVCnpEMkNlUUljZ1pSQXd4bHFLRFRQ
+            b010ZHo1NUFBUXdKNzFLREpkU0I0bHcKLS0tIFNkNDlkTDlPWnBua2hYYXFxWnZ3
+            SnVGdkY5VTFQSm5uU3RObFpmTFhhQTgKZ1LdOE19ynxZC/NOP5xMz2drFXcuRKhe
+            Kct0x99Df9M75e/EwmaDIqpqF4D5s94T47nrRcZ6cFGR+5tvGnQ23A==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1vuxs3pjmsrug6t57zy5tsf3wm3cqml5ew6dfywkppzv52kchxc9sduy2wf
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBReEt3VEQ2dmI2MU51dU8r
+            YW9WWjZuMkZhcWYwdTBtY29aOGF5QS8wVUNjCnduWWRhUWZ2V3VONXdORmQxZG9J
+            UEdPWUtIcFoyc3BmS1FkMGJ5UENBdW8KLS0tIGlVUW93d1hRMkY0SkZqSkNLNmF5
+            dnh1UnRDYXdieXRqUloxWndQUnFQYzAK1gHqMusl5QH0/RCF/ob3Qp0X4CEszcHz
+            cOOs5IYTH4Xd/rmFTOZzsxWzk7s/4pjIfHYgrY296383CXFYYgZuSg==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-12-28T20:35:38Z"
     mac: ENC[AES256_GCM,data:kqRI22yDjXocdA7hu20ZZJGIyLQKRve7EuUvxOgtSUbtIUBvuueQK+HfLnHCbAx2NHdzSwKl3bN1FTsGok0NeWTMDCczedxqm88uD09039PNa5NXKrjtei/qJHxyUq8L796KtyzacFE8mOcziWxgatSJqZN4N/T3vSg8PhrLp3A=,iv:9AchM+2qLsMMxNFWrHK2ifQqUbz5ol4svdUwe5IDN4Q=,tag:8tRKyAr05qLMS0DreRCgfg==,type:str]
-    pgp:
-        - created_at: "2023-11-04T21:08:53Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA0IKwDTH3WibAQ/6A9J4BLBqnMsV3fvcxw7YcbDVmEEd5wAAcv93gP6LbrTu
-            6qXJjQuwJdq1hcD+gk2f2IPtYoMcjlRVJK6POL5ojlCpFcMmoRgzema61B6/hOvV
-            Q8vZPb7D1lpRoD9AlkMH3EVwiaHWhcp91pHLXFzttWNxddvLyCYFa/z6NwNBxcgV
-            mM4gJLSPIXPq273Xh35oti7B/CGyoHHyLRwx9BPmPTxbU+H0x038M0kWrNuRt5lK
-            7R+KBuGNuErdde9E3lgBYKRSB6LAUMWeQU4nYpJ4ILyEgxG68yLvXNWTlrbVI3Fm
-            ayLb7Q6I6SaMNvBtFs9+RhbCf9q5EYNqiGZdS62qKKkWP8dNCBThPTOn3VmtGGQz
-            xaizyEL2PlEjr0WuduenVvYP28eGBtzRpEmvO7/B/brjT9AoJ3il3Iw49d6HFHvU
-            xUvsHoGbpJMdkcmoXqEFItvahlYY1xmr2qaqj7RXtt09iw/fESQ03JU6TXzYHiFO
-            ifyP9Ms+vMzWjSGrjoF3/3MdPwkzKAJwEVGVnNiJNs8uJdRtodOiaY1ny2rmaTSB
-            mqlwQlQE0AqY4PUT1gb3sIJ3CldkaeQOyR35Lh2mJIF9yZMIAul43pkv7NaJWwzO
-            s17BGPwra6u5Mp9FliF0SwI4D7hK90bjCrIAjN1Fjpv+SqftqtspR9qNAB4VNiLU
-            aAEJAhD9cDlTpGBm6TrQy3JeFnY3WUAYRcTF4aDSWlXePygj7kaJPTmibd0d1bf/
-            f2DbLNTqOhuxneCqyl1zzD25uRXU2JlHlQfoOzHaaSnedeml0ly5iMbXeP3rM3/V
-            OullBXD/8t3P
-            =gb4U
-            -----END PGP MESSAGE-----
-          fp: 03746612698994281D322B09923BC5E9B4E9509B
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1