Clean up sops file

2024-02-29 14:22:37 +01:00 · 2024-02-29 14:22:37 +01:00 · 3e637b15c5
commit 3e637b15c5
parent a69997d875
2 changed files with 36 additions and 69 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -11,38 +11,32 @@ keys:
  - &minio age1cjxe2e7zemvs0jacjawug6k2qnmcpvnka3e04mfzp939h7hppydqrlp6l5
  - &nix-cache age1ffpkfl4ged52ym7ynyhjc40t9v2g6pgjp4ue670lxcr6mxy7mdtqt5qjlq
  - &proxy age1yz7k9s5plamjq425memjh00y4sdldgdhpwxqpx9gk9wutttx9scsdg3qd5
-  - &k3s-1 age1gsjy4em8u668tnx77jr7kk345m4hzmmt3seclzvsd25ldgwd45pq6zu7cv
-  - &k3s-2 age1ghda0mj5wc2vpksjuvaf3t0xklpcgnykvepzu9k5csf482ngpans9h05pp
-  - &k3s-3 age1mpyg2qcrehfcpksygk9hduz79l93gy2crpwn0vu70mtcmzapeyvqrrjw5r
  - &saga age10advysga7fpkh7uuv9a7phs77c5khswf5c9q9txvrauxtqr4yu0sk2r75v
 creation_rules:
  - path_regex: machines/loki/[^/]+\.yaml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *loki
-          - *k3s-1
-          - *k3s-2
-          - *k3s-3
+        - *erwin
+        - *erwin_horus
+        - *loki
  - path_regex: machines/ci/[^/]+\.yaml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *ci
+        - *erwin
+        - *erwin_horus
+        - *ci
  - path_regex: machines/frigate/[^/]+\.yaml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *frigate
+        - *erwin
+        - *erwin_horus
+        - *frigate
  - path_regex: machines/gitea/[^/]+\.yaml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *gitea
+        - *erwin
+        - *erwin_horus
+        - *gitea
  - path_regex: machines/gitea-runner/[^/]+\.yaml$
    key_groups:
      - age:
@ -52,9 +46,9 @@ creation_rules:
  - path_regex: machines/heimdall/[^/]+\.yaml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *heimdall
+        - *erwin
+        - *erwin_horus
+        - *heimdall
  - path_regex: machines/mimir/[^/]+\.ya?ml$
    key_groups:
      - age:
@ -64,9 +58,9 @@ creation_rules:
  - path_regex: machines/minio/[^/]+\.yaml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *minio
+        - *erwin
+        - *erwin_horus
+        - *minio
  - path_regex: machines/nix-cache/[^/]+\.yaml$
    key_groups:
      - age:
@ -76,9 +70,9 @@ creation_rules:
  - path_regex: machines/proxy/[^/]+\.ya?ml$
    key_groups:
      - age:
-          - *erwin
-          - *erwin_horus
-          - *proxy
+        - *erwin
+        - *erwin_horus
+        - *proxy
  - path_regex: machines/saga/[^/]+\.ya?ml$
    key_groups:
      - age:
--- a/machines/loki/secrets.yaml
+++ b/machines/loki/secrets.yaml
@ -14,56 +14,29 @@ sops:
        - recipient: age1h7ddyj66gcqt5vnzphjfn6y5tul79q0glcdl0et9w44z2evl999qe02wht
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1UysxelR5dzk0c29zanpn
-            ZmtPSHNhRXJtYjA3a2xTdkVFYjZPSUFROXh3CjdXNmg1Rk9MMERMYzRHaVdhU3pY
-            TUdEdzh5b1Z2a2FZdkZzcy9WRVFBTmsKLS0tIDgxNXNtVDJjN1dMR2Eza1BRRGJP
-            TGVITVM3b3drM2Y0WVJDckRUYzIrMjgKtEVhrvkm8z3LVwQi4AuOJxjkQ5kLJFtb
-            lxQIN8hrgkGMwsiOUyVbDw6z5tt4AmukHuSUaP7AXX3xvOl3eFPT3w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZ25lRzQ2c0x4VC8vUWZW
+            ZFhtUi9vb01KRENVdDNMZUZKd2ZPcWwrOFZRCjJJaVUrUXh2dWZqUExxb1ljSk5X
+            K0x2MVhLRUZWa3R4cytvVFRhakl3ZzAKLS0tIHVhQ0RYcytiM3pxUm13UUhmUndD
+            aTdXbkxMUmlGVzJOR1RYcDlocWE0MWsKBeZPCt/CoAIZLboih1a2RRCD0YFkVFBM
+            2dJJOXHTwuGfJ046vUCJoOng5iCE/ltB5KA3PWmFok8Geeqo9bjY7w==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1435gxhlpu55pp86r8pullhc6wg43nv6qm5l3g2vl5000xhn8apdqtlf8cg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlVDZ5N1g2Y0dYYURZWnhG
-            SEo1WFNIYjY2d2dyTlRtOFFVazJwcUNiOTI4ClpTZXZqNW9QNmtRQmljb0wwTHJW
-            K0p6TDRMTnFTWldSd2QrNFRuV05tVDQKLS0tIHp6MStBTzUrUlBLSUlpc3N4N3Fk
-            a2FINk1wekg1cW1JZDRJRmJMK00rMEEK4U4WQl+z0V9CH8PBI2BINwC/fjtLVbj4
-            d7CEm6QajGIsI2YBgzlbXhL+zIQSCGaPsyRcYSLGxWmPTc6/On2Z0g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2c2pGcld6OGI2SWZWMEhG
+            RStjRVovczlaUDJORE8zVjNnV3FKWitqd2g4CnZuWDF2Nk5oYlJBNFdEVHo0andT
+            ZDlwOUd1eEJHS3Vld1FuUng0VXNvSTAKLS0tIGY0REdlRERYUzBNVEhVRXdxWmti
+            QURXUEY2Qk1XK2dlTnF5QkNoSi95bWMKCT4lp/lIKa1Tfz2wDIu5JIsarQajzWnt
+            GFeHaPz825Eh1h9HlE8UW4WDdvG4NfsujzealNgu5fa6CUcOawZBiw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1m93jeyexus2uqvrk99r7hh0xp7qxk55tgmju4h422dfkf92jce2sxpntu5
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1cDBYYjhjSDBrd05JbjRP
-            UWhVWjNHYWdPY2VOell4VDdpOWVZOEZROVNrCk84U09xN09nK09kc3l3M2RuUVpN
-            ZkRMZVNCdmlDbVc5VXUyOUROWE1HQncKLS0tIGZMZXQ2RXg5ZTh4aEdTajR0Z2xj
-            S0s2emlQVXBibmRSNURCQVZabi90aVUK08sP7ERNk2QKIIuOgICjHhb9s5ot6wSg
-            k9VOXYzTAbXuF9Wbj7niSA9aZ4Ik0HbGFNTMMeqdSVDeySCIAkw5nQ==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1gsjy4em8u668tnx77jr7kk345m4hzmmt3seclzvsd25ldgwd45pq6zu7cv
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxNE02VWdDR0dJTGJnckZO
-            Nk9RaHMzUUtxWUVaMjRYeXM2dGo1M3lQRm1RCkJENWtVYW5JTm9MMEtyYnNVZ2ZN
-            Rk9WWG5BMkorWXM1MnJwczhuMEFaK2MKLS0tIGZGS1A0QjhhbUxpZnV0WkVqT1Zs
-            NEFmakFPK1BZWk1xZ1hBZk9HMGlMZ3cK+p/ErT0Kjga7hjebrEW+jnPvLb3LJqv0
-            RfIBQwk79ZDcdqtKKQcDt7HfXggkGPsDD5LZRxE8sasbnd7C3V8VEA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1ghda0mj5wc2vpksjuvaf3t0xklpcgnykvepzu9k5csf482ngpans9h05pp
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzclIyNC9KQW5lb3M1SDZZ
-            SEhxZGtWek90Y1pHTFNNSGk3eE5mbzUwUnlFCi9UVXJSeEJiaUgzeWVrMHhlTVov
-            UVVqWWpxRmIxVWhPTzF1M3U5dncyM1EKLS0tIGpnUTJ2dGh5eGN1OC84bkFmQ2xW
-            bm1pM05hMlAwL1FmT0RXZlBHQ3kvemsK53X9hG/3Xtv4QUk/F9Un0uhIOfbLnDmn
-            6n5HVJtVf90Ol1r3soNuDD2PnQpGc4V9Dml8oMm5Rinz9fcPwN7vvg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1mpyg2qcrehfcpksygk9hduz79l93gy2crpwn0vu70mtcmzapeyvqrrjw5r
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEa0JnckdoZS95U2dhSm04
-            UU1BYk1MOC9KWHMwT2JDUjRSWnZ2bTE2RDFFCnlZZ0JPdFQxa3MwU3k1SHp3TmVX
-            bW1yRmpUU1dKdjgwUUY4TFBadDBKQU0KLS0tIFVYaDlHVVNGVkpSaks4T3A5dStp
-            YlFmNzNseHZXSk01SmEwK0ZIRlFmb0kKPms5J3yViVwgwvQhI5XYwcNQZs4Bhwv4
-            scaA7FZV2sa4x+EXrYAxg3AioH7QOky02FujCOrUaThlLIzDVucgKg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaY1BROUx3L3ZRT1ZSZHJo
+            WG1ySC9oVWtsSUZMaUV2OHIwUmJmL1lITW5VCm95STVkN1VSZFNTbGlTMmMxMUdO
+            VEtQZE5idExFdEUzK01Ud2UxSmpXWUEKLS0tIHFoZEVKSHpoTTJZVHF6NkRVWUVk
+            c0dlMkVlRG9LYU00M2M3UGJpUkxDOWsKiwc5oM63ezv1TVng0zQOqILOxuRMU+j7
+            hHl6AWg0iorXJ1IWmGxLINDAK/RQVEFLK6gRjfN7qB+6wdmrKl8seQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-02-07T22:49:34Z"
    mac: ENC[AES256_GCM,data:e3HW2LmCFwxXt2QkKf7pGKrpBQLFETVzz6w4/EEtxSzcuFn7p/S0AYk/4/FPXO+Gke1ccklXINFb/Qk0KlaWeToNg3Pp19xt5b9apvJQsoXQOuzjxqHDRkwZjGIFsYUvVgt/YNXs3AsTJzeMq0RjaI96xbwCitKvZl+sJP1nUBY=,iv:vA8xjOljqXwHwG+aJuCORgcHcNGgNf4L9RRV+dZv4+w=,tag:1Ukh7LQ/yTurdANzygxvXQ==,type:str]