add sops keys

2023-11-20 22:25:09 +01:00 · 2023-11-20 22:25:09 +01:00 · d5ff54cf25
parent 2bdfea379a
commit d5ff54cf25
5 changed files with 175 additions and 93 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -2,15 +2,19 @@
 keys: # https://github.com/getsops/sops/pull/1123
  user_pbsds: &user_pbsds
  # test -s ~/.config/sops/age/keys.txt || ( mkdir -p ~/.config/sops/age; age-keygen -o ~/.config/sops/age/keys.txt >/dev/null ); age-keygen -y ~/.config/sops/age/keys.txt
-  - &user_pbsds_sopp age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn
-  - &user_pbsds_nord age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs
+  - &user_pbsds_sopp   age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn
+  - &user_pbsds_nord   age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs
+  - &user_pbsds_bjarte age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5
+  - &user_pbsds_hm_pvv age1dws633vckj6aye9y5p0nv867v2y06j6cfeys87rsy6e8nq6dsfyqg0aksk
  hosts: &hosts
-  # ssh host cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
-  - &host_sopp  age1zvqjaanff7x3f2a7853sd9ylna99khw4x6qfpf6am4yupsc44phsr2vfy3
-  - &host_nox   age1zh3nmy2a7s2v7g9t7zg56p8sjqwmvqv5s7dn2v22x5nxyl5wfdcsaf5tw7
-  - &host_bolle age14d0ahjjk02jyc25hhx9ws333r0yk5e06yf4ys8xhz2um7jp6qqaqfcdksg
-  - &host_garp  age14qunhxz08gmw5r8ky0ez9rjf9dj3ue9hrzz580gwwj4cms46vd7ss4rutf
-  - &host_nord  age19xrvt0gjl4fcfjyy62mrl9uuzrq9e0wgemtkykr07ewz7nqn9cwshngel5
+  # ssh $(remote-host) cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
+  - &host_sopp   age1zvqjaanff7x3f2a7853sd9ylna99khw4x6qfpf6am4yupsc44phsr2vfy3
+  - &host_nox    age1zh3nmy2a7s2v7g9t7zg56p8sjqwmvqv5s7dn2v22x5nxyl5wfdcsaf5tw7
+  - &host_bolle  age14d0ahjjk02jyc25hhx9ws333r0yk5e06yf4ys8xhz2um7jp6qqaqfcdksg
+  - &host_garp   age14qunhxz08gmw5r8ky0ez9rjf9dj3ue9hrzz580gwwj4cms46vd7ss4rutf
+  - &host_eple   age1fha09v5edg88ys45a0u3tpjqfyl29fsy9xaz8xxfy60zjhmas5psfdxynp
+  - &host_nord   age19xrvt0gjl4fcfjyy62mrl9uuzrq9e0wgemtkykr07ewz7nqn9cwshngel5
+  #- &host_bjarte age1gy6gyp9qqt5vlkzymfxsrdqm6rctl39tx53jx6n0hgd3escy844q55d6ey
 # https://github.com/getsops/sops#key-groups
 creation_rules:
  # global
@ -19,10 +23,12 @@ creation_rules:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_sopp
      - *host_nox
      - *host_bolle
      - *host_garp
+      - *host_eple
      - *host_nord
  # dns
  - path_regex: secrets/dns.yaml$
@ -30,15 +36,25 @@ creation_rules:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_nox
      - *host_bolle
      - *host_garp
+      - *host_eple
+  # home-manager
+  - path_regex: secrets/user-pbsds.yaml$
+    key_groups:
+    - age:
+      - *user_pbsds_sopp
+      - *user_pbsds_nord
+      - *user_pbsds_bjarte
  # sopp only
  - path_regex: secrets/sopp(/[^/]+)?\.yaml$
    key_groups:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_sopp
  # nox only
  - path_regex: secrets/noximilien(/[^/]+)?\.yaml$
@ -46,6 +62,7 @@ creation_rules:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_nox
  # bolle only
  - path_regex: secrets/bolle(/[^/]+)?\.yaml$
@ -53,6 +70,7 @@ creation_rules:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_bolle
  # garp only
  - path_regex: secrets/garp(/[^/]+)?\.yaml$
@ -60,11 +78,21 @@ creation_rules:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_garp
+  # eple only
+  - path_regex: secrets/eple(/[^/]+)?\.yaml$
+    key_groups:
+    - age:
+      - *user_pbsds_sopp
+      - *user_pbsds_nord
+      - *user_pbsds_bjarte
+      - *host_eple
  # nord only
  - path_regex: secrets/nord(/[^/]+)?\.yaml$
    key_groups:
    - age:
      - *user_pbsds_sopp
      - *user_pbsds_nord
+      - *user_pbsds_bjarte
      - *host_nord
--- a/secrets/default.yaml
+++ b/secrets/default.yaml
@ -9,65 +9,83 @@ sops:
        - recipient: age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2UmM0eXdJTktjM0dqMENr
-            U1VBKzltUnRvKzRXSG9TOUUvMXRCVkpxMWlZCk4vZ08wNUdvS21IeDg0RkdNNUVv
-            OEdNbnZtNjNnV0hsVjdPV1A5Ui91eE0KLS0tIE5Vbk5KemxGNDExbjBvSnJyKzVF
-            am8xR1RqWTBFZFRhRWZidHppRGV4RDQKlv+tFquJxLIeCBuTpj9OWkiwd5kVUqJ4
-            stmVpEN/SnUq/A880+g0Yt9rb89YH9gSQuDF0huZs4MwCbmOR+U8Sg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvSzB3Q3owbzgwSUROWFFJ
+            RGhLVnh3MnV6NkxEUnZtdTMxSVc3dHhwSldNCjFtbXFXaFY2bUYyY1VPVFk2TWtj
+            aTRsSG1tQ1cwbHhUUS9mTEdUcG05eEkKLS0tIFZEcytJU2pRUHRKcFYzOVM2dXJC
+            N0lQay9oaUdxYThXSUFGaEhOandTMXMKvL1rigxqeS7FvG8k2H1zkBlNEPwCvZXq
+            Xbz0rDYMHXGOYdOiKZZpQ73f8SouECtdgBKH6FSHitRg2rFYfuZvSA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPSEVGamtuSDFXb2pnUlRM
-            clB1eXlhWVJDd3o1MlN1R2x1KzBCRzh2U1dRClVIekdrL29NSUkwb0duSFVTY2dO
-            ZldnMzZubC9sOE1yVUFnWitNbkd4RFkKLS0tIHZ1TFFyQ2NISkdka1lwNjBTYVc1
-            TDNrcFRZMUlSLzdKZWJaUUlFVzhQSmMK4AxEHJu1v8Yv9kh95ggdqwsNUbgh9+Q9
-            FSiLXWenCvk9DS2JPkpRx0w5FpMZQv0bXVVYexaI7H+/1PyNmEBL8w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZd0VEaEZtQ2M0RTlJWmtH
+            Si9PSzRkZDY2bW1zTXZqbXU2dGwwWGUreW5VCmV2TXgvajQ1WisranZSa1c5MXVF
+            aWRHN1JOclZUdDFwaWNCMHlhSE1PN0EKLS0tIFFxM3RzdjFqVFdpT0thSm9Qbko3
+            L1ZKYkNyaXI5TWUwMWRjTWtFVmdYWEEKvr95iSfxAdu5h6Z8QhBr3nuQLq53DQPq
+            04r3REJBgCMKZuLfCuJO3jlVrUfPtuUTtOsA2kr/TPBoHB5Xd2I6OA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4YnB0Y2x3TmFSbEZlaXFZ
+            Y1BlRjJwcEc3RDNCdnNLM1FVNE9vRWRJOUFNCk9nWmdJK3NxbGJ1TGZicklGMnpS
+            TUgrcS90OGRZeFRlRVgydnhLenZoc1kKLS0tIHQyTUpmUjkzem1EeE82WnRBelVB
+            TWMrcjJtZkl4dzN5U0xWYUFVc1BMcGMKIcMO5kPdOi4XIS8QfsQJ8J4ZAz32iies
+            ZrGmN2d0N+R9FITGNPM72Wg8dhKi3wbI04wYwYbn6SXhva4hsJeeGA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1zvqjaanff7x3f2a7853sd9ylna99khw4x6qfpf6am4yupsc44phsr2vfy3
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYkErT0ptQnlyY1RSTFRH
-            aTduQ3VaSjhwblA5ZXF2RkYvcEJNQ2o1U1RNCjg0Z1FCdDlBSFppbGFxMER1cU1S
-            SERMSW9JUWd6WmpveUJmZHYyR1VvVkEKLS0tIGRlYnpxTG5KYjJnTXhvWTFEUTJR
-            YUZuVFJDTmplYWRwY3VpRFNmcitjZTAKJXvKVZpfP0/WllSg6iKMlW/YTuhA+KIn
-            r6TySJ7p2T/li4MqB0oSKlML9JwR362njriS3G+uPUpKXueI8x6HaQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtZWdhbkt6amljTndzeXhj
+            ejlmNUlFZml6NTlkVWlhMFRTZ1Q0a1ZUbDE4CkhGVHV0OW5BZEIvSXdVRzJjUUhY
+            Y2JTRTMvSmtGNzZHMlRrUzRmR1kyTWcKLS0tIE95dkM5ekxuU1lFc2t6b0VXUmdH
+            azV3TDdIS29ERXN2Q3BSdFhHY0NoV2MK/rMmsBf3Uzb95Kuj13jn6wANUWOGiVEc
+            vweBtI08ce2JVBTDyt6WtJj6mfm1IDd/RUMP3tmJdDPRiHzqHW0NlQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1zh3nmy2a7s2v7g9t7zg56p8sjqwmvqv5s7dn2v22x5nxyl5wfdcsaf5tw7
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLejBHckRFdjVoZ09MbDhS
-            K3ptSnducnd1WUxnMHdWeWE2dStPNSs4eWcwClZFOUZXU2pPWUtRZmM4TUcra2Z0
-            clQycWZtUzFobGVmejc4NGpRUE9wSUEKLS0tIFBPdEZZOEV6by9iSG83Y1hYL2I5
-            SEl6cGxmRkcwWkZNZkY0UVlQNXNOdTAKWAiwKCBscujcohi15KmzGdJpskSuBMBe
-            NhYPWXCb3UA0ZuuSgK4VChAREjyPEyV95dcwe4HkzrS/MeQ6mx1QCA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3d3UwbXFrZS9yTk5ob09U
+            ZjEzaWJXNnVLRW5uZ3FmbHl4S0g1VUdIVlQwCks0OEJhMkd6QVI1ajZRbWxpY0I0
+            UE1xM295NER5S1pMalVvZWxrMW9qTE0KLS0tIHpZcmRaNVhhazdiUm1nekhPWFo2
+            NlB5d0N3Ty96N1JEZkI5MWtmWU9SZHMKhJmbfTUEPvvR2Bn/fuwkrLDkBtj+DS5v
+            ivWL2axiejPF1Yh0FQnBQEG/HJYa0VS79CiD+ATjgMs/t8cbQWNAiQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age14d0ahjjk02jyc25hhx9ws333r0yk5e06yf4ys8xhz2um7jp6qqaqfcdksg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5TmlJVkRVRjhZUk8wMVlF
-            aFJYeTVtM2hmTVhtbE5mYjBocjFzV3dzWlFNCkxwZmtGcnlwRkJEWWZJWnJOWE9U
-            NGdUbElZZDkvU2F4dHBhdHh1bWhmdzAKLS0tIEN1U2I5S3dncXlJeDVEc0VHd292
-            ZGljSmRicmRSQThYTE1qbE81K1BxdW8KAMef+ULdxgbp9gwyKyOFOjdNozV/osep
-            vusNIAIJWA21NG+jyezkSP9AR8Fv2EdEOA4uO3Ol0ej312x1/MdenA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJRk04T00vbUo2MVFscEhu
+            cXo5UGdqR2hyaUc5NURiMTI1TmtCdUFUV0dvCm1QZnZkUlNKZytwa0pRc1YxNEpr
+            cnlmSTdCbFUyZFhPcEM5WjdDSjByWG8KLS0tIG1WY1hteEZ3UStyRHhNcS82TG9i
+            dEZLZUpheGNaV1dCMlhJWERPa1Rqa1UKcIcvHahi+t6qwVHhqgy54gwDQXwFjXcA
+            ftE0mg7xa5j7F4qGwCsWBsOKIFI57UlAaFo2+qf81oy4m+v+bl6HmQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age14qunhxz08gmw5r8ky0ez9rjf9dj3ue9hrzz580gwwj4cms46vd7ss4rutf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLa0RuUStiSzFTemdVQklq
-            eTNQYzdXbVh4QXIwVjVZZmttOEdid3FCK1I0Cm0wWUZWM1ZBWlo0dGxKVDV1REIy
-            Q2ZYN3lIWVowTEhKR2tBaFJCWG1IVWcKLS0tIGFkZStmRGJWRWhKUmgraVZ4cFhL
-            RjlrRGcrcTJta1ZueU9PVytKY29ucmcKWW95m49are6jH4RKGy/NmczJrTLTLewH
-            xqQ6o/37eaYCC9tiLPO+tyyTFfCfiUaldcgrZgiThxBLLFb3wrtqLg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBERS9YOTcxNS9HK250c2hk
+            QmNydjlWMEMwRWpLc2oyRXNTcmpLOUk0RUZBCm8rVm4xU09DV3E3bm52K2FWdkdB
+            eC9UMVlITk8wWWcyQmJjQ0R6Uklwd0UKLS0tIDRDSzlKZFFtSm5UTmpDa1VCT0JI
+            RGR5dG1kdXQ5dHptZnhpN0tCd1UwekkKfyq+CI5hjtvqiDBk2N83HITyiEXODJBp
+            1GwN3+hyhk143B93GG8ayGj7K2Wpjcs+k7iRm5qJYt1PJY4gNGCszg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fha09v5edg88ys45a0u3tpjqfyl29fsy9xaz8xxfy60zjhmas5psfdxynp
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTVDJUN1NQR1B2aVhBeXRv
+            SGw3aFpWY3N2WDlpUjFsSUl6NHk3NTBTOW5RCnh0OFNvSlFZcHdyNXBrOGJkdWFw
+            R0xrQ0dOYVlKRkkwR1JRekNNc0Z0aXMKLS0tIEFMQUJhZ0RjZklpaFc2aVN5b25W
+            ZEd1cU9DODY4VVhnT0Zwbno1Tk9pTTAKwwXRmb9Q3sDZPjj0XqsQEIWwIZAurj1+
+            Jde3R0DyVmResU3wmXC7NhG+sBiYFLuAm5ZNrAx6FGeRKxPHBC619A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age19xrvt0gjl4fcfjyy62mrl9uuzrq9e0wgemtkykr07ewz7nqn9cwshngel5
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1SU5QVG5tUU9saXpNOFM0
-            dkpOUi9nT21BeE5kNE5IdzlTcVBKRFVxaGxJCnpjYllBZnM3Q29ZNmZMa1FkL0tJ
-            aTNYRzNDRkJaN2h5N0NlY1JmM0xteFUKLS0tIEptZlFKRjFOSmJtWVVyaWtwdy9x
-            ZHVMRTJNQW5NZldJcVBqTUlxM2J3Y3cKniYqt5SL8PcDPuBgfUYu7FYbrk4aLFWS
-            gEAAHbwj3bB2LvJDHPQS07DN8MK4rGsIV4UjFC7maVxMsonC8F+F+A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGdVRJeHl4cEJzQlJVR3lB
+            V2hiTE1JSDI1ekx1MnFmenNORDFHUXdKU0Y0ClpGaDZPWFR1VTB3OGlCWGZXdlBU
+            MFh1ZWtzMGRWTEpGRTZPWlA5SEhpejQKLS0tIG5YUXllUytLWlpibVV6ZlRrelJl
+            K0NhUzlVMGwyTUw0Q2NUa0doRUlWWUkKac4TyebrwDqK9V5vdk/3+G0zxT40eZYR
+            CXkHvd/bkZ3CsRST2TTGCFARC8G+2fXQInpK5xxSFPbjJ5XiiNajXw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-27T17:15:11Z"
    mac: ENC[AES256_GCM,data:P9oX5KVP/64JbHX1qLiSf68gI5VxT5Ziyz3Z9oIoWWeW5SgqBXndhUKtOrM8QKjGQtFnwqjnD7nh8VTkn8SKK5+yraNkjzdpFFLwdQF7Dm0/wNKI6LNULDUQyllHO9K27qGqDWzMtT8dOpA5u9co1/mpNjbHkTR+zT40UOlgdEE=,iv:ddvCyG9BR/ZI3HbccI9yhQUAoh2pmNaCpzxG65mEGm8=,tag:UU4ylynRMPSrv2AHvI2P3A==,type:str]
--- a/secrets/dns.yaml
+++ b/secrets/dns.yaml
@ -10,47 +10,65 @@ sops:
        - recipient: age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmNng3M1ZNY0I5V1ZGcm5U
-            b1RJck5LcCtLelZGUzIwbWFqcTlTQ2h3NXhNCkpaSE9CWTdsV3pHM0FNRFcwekth
-            dGFUaEVIdEFjaWQ1Q0dkdWd2ZHpDMWcKLS0tIFZ4VUd6enJwejc5OTBsbmIvWUFm
-            a2NNUHRnVFViV2JpTDZLMU0zaUxpQVkKxgz4avHqZjtsjm7igvwm51NGt1IzIQsL
-            0IScUFg53W11BNwoTXDNWT7Kb3pk03QSMd57ldk3me2VJ4BNopen3w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5Q3o5SDVFM3FDeDd2Ymkw
+            N2tScWVqWlEzMTRWbUJGZnJDYWpkZXpDc0FVCmpDa3c3ZmNDak0wdDhVQktDNVhk
+            UlBYL0tWQ3UvbWJkelg4OHpwUnVhL2cKLS0tIFNZQ0ZrUFJIRGFjYUlaaFpFUHVm
+            UnRFNTNsd2dWWDlXYWNHQWJ2VDRJTzAKZ5gt5FwH29X1qXyp83fh+FIbSKlFXZQv
+            Udsr8MuWTklfz+ErEuQnte/P+F3ClzZt66H0yDSJas25OoxAlyCCBg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJSnpwTlh4bjFLd29Sc2VM
-            T1dITlBRUnZuaE9yd2ZMaTlIeDNYZEZTeXgwClJvNGwxNmxxYmZPYlNjbzlIeS93
-            Z0VpUXNXNXpocXl6a25pMklOR21QbG8KLS0tIHJOVUVHUGw5RE1XQ0tUSUhFVW5j
-            YjIrVVI1TnozZW5WU3dybjNmWTRya3MKon/o6kl/F7PpPn+fs1BeUs3mejM6EH5S
-            muw0/UWsb5a5q/7Gzp3340PKrXfNWvU4wveXpWN6aWfUOwRWY3c7Kg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLaVN3MEdUUk8vTUI2ZVNr
+            MGNkOGZqc1Jhc0JYYllRMG9yWnZTY0ZnWUFvCkkvditzb0NzWEpiRU5XUXh3MGpM
+            NUdvYnQ0elNSaXFWQ0Fid3JOdWtRU2MKLS0tIDVMOHo1UkRoQlVQSEdYMzc4Smha
+            VjNSZzdwbkhWcGFzTWcwZVI0SWtNUXMKIZHDvEafaT6jn2zw6n2VI5k3ZmFggS93
+            C/5aE/jmcKxkiOb4RQe91hqYYnxfk0L2Z5OLYp2rWLQPZiU0Wt9IZQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4cC92aDJROXJFWS9PaEFQ
+            c2RWYkR5dnI4cVJFdzNzcUxBZEdQbmZES2xjClFTOVl2QXJSVUhvUFMvOC9sUzAy
+            OUZjenN2RDY4YVN4T1RsZjdsR3pHbVEKLS0tIGJ5TTM0N2ZXUy9Vc0l5VjA4ZGFU
+            ZWxJa1hoc1RJeVd6NnByaFJBK3NiSk0K1Sp9U0o0PZ08K4Xdbns2Vgp1xwW87apr
+            6pH5lJUme0UdeSKOV1ONvC78APKuVue/JDFb8Bhhjb6rcSPxWYIWXQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1zh3nmy2a7s2v7g9t7zg56p8sjqwmvqv5s7dn2v22x5nxyl5wfdcsaf5tw7
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAySDhuNWtYWHJhRlRaWWt5
-            NUkzUGd4d0VmVW1BRzNKQmJTZVpQYmVqc1dnClg5N1lMRlM4alFad0NJVE9jZVo4
-            VVBVRnRKM3hEZ0F5UXRvV094aEtaazAKLS0tIG5Uc2p2MUI5dFZsaXhtUzFUaGE1
-            ZlpYcWE5MXlFMHlCaW5jdmt5NzRGUFUKocHdzkY8M/6h2EyM7bujwAHyMi/E41Cb
-            WkKCaAKkailS+GkM/TweI16OqT93jduFnl8uTPAvbPLHy0GyDVjNrA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiMXBiNHh6S1pLYmlRQWRO
+            Sml0eC9rQy9zUjZYOGFkZSs5T2p1MENXVFQ0CmRySXBqV1hIMXFWSVVpMHJlMFZR
+            QzMzNEdBQUROaE9MQm91Y21CaFZ0eTAKLS0tIHlsdEpFSG1NdExwWVM2SGRSUXJv
+            Vmh6c25tTFZMby9VMzZVK1pYVVIxTkUKDFnPHsV+gTEV/HIV8xVyMluJ3PUyP8KD
+            TB18CGZQwfyKPkELJylbfpsiGDAYn1xcrZ/RzbDm3nsPJsPYNs7C8Q==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age14d0ahjjk02jyc25hhx9ws333r0yk5e06yf4ys8xhz2um7jp6qqaqfcdksg
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjTUE1RmlHQ0tucUQxREJk
-            Wkxtc21PS3R6bHoxL1JLcm15bXBvSXdHeXdBCkxGMFhzUlpJeEdYcVlRY3B2ckY1
-            ODJIYWR1SjlOdTNxOGRDZTVHNnpZMjgKLS0tIDEvRVBld0Iyc1RlVWJvdy9USTBo
-            STVJTUgvRUFBWjc3SndYdXJsbmFLR2cK1OqMn3+n6gAza3zhQOqzo64eW5tdfLo0
-            KKkujO4USdicxVgVlo6sxYiSqTUSxZPXyuu0NE5yx7tYbIWyAgjumg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1Vk85MWR2WUw4TXJXbGpl
+            UzVHRGk4Qm1Eem1wWE11eWVNdko1REZSeVg4Cm50TE8xVitaNDRESlpsS2FnUVdk
+            NDJMZ0NUY1hNbUVpUEhHaG1uV1FqSTQKLS0tIHk0T3lKck02cDkvRkVUTHJtVnpm
+            YnQzUUlzUE1hbnpFSFJwd21yWkNjWTAKSR74I0H7X5XBcphElquMzZgI5gf4Q2y1
+            IBIH8KJxEF0OxuoKsNYaRW1TCm9etFwogzZ2nkRLoGF+yqR/5o59fQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age14qunhxz08gmw5r8ky0ez9rjf9dj3ue9hrzz580gwwj4cms46vd7ss4rutf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUQ0kyZWNucW5QQnB2dzNX
-            clJISStmUlNuMGc1N01hYytDU0FORStJZFE4CmlydE90d2I5eTVvdFpxYUFHSkxH
-            bU81SGxLYXA3Ukx3Mm5lV2RCajdOU2cKLS0tIGRHYzRFZEUxdTIxS2gzY1VEZ2Jv
-            c1BTeXpyRGZtQU1LUm1iMzErMDluSDQKBu9cm3fTH8gKi6kHUC/RIxMnSRyHYWRU
-            e5SXS9RtstQAPGcBt3677iZJrgAXJwB61OPUn8WIDpV6wckx32JLsg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3SnJkVHhFZTFrbEdFRjhQ
+            TE8zUitZM3MyeWV4UkpJSkVwNXMzZ3VlQldZCjM0R21GL1o5L3RoNmMrMWRXM1Zq
+            WEJ3VTlhODJrYWJnbUR2WHI4MEkyWDAKLS0tIHBNK0pxdURzMHJkYXExNTdHUzhx
+            YmF6cFU1aTZiaVppZzJsT2NYbFA2RXMKEKikN0vncaMKfrS+0gMP8pMQ8iyujvit
+            7c4Unl2YQcwYsaFkOOun5ZBr36vycuJRiOQWVor13a5IdcGrSYW9Ow==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1fha09v5edg88ys45a0u3tpjqfyl29fsy9xaz8xxfy60zjhmas5psfdxynp
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXblZzRittQVh5c09JVXlK
+            OEk1ZFpCMGZvNzJiSHlpWHBleG5SVllnTFJnCmFCd0hHOW9oUnp4VVVMWGE1QVRu
+            WWpMSU41c2dVdnVnRC8vU2VoejNhaHcKLS0tIEtPVlpKNzhKaEJIcFpPNU5NSThw
+            OTRDZUgxSjNtcnlyb3BCK0xYVUdPS00KMSwuMhZHPCwqUotYh9q63b+ubpyg6K6z
+            /0ZTBHu/Zz+Yhdcw3crRvD2Lz3m5489eg/QjB25cEvp2H+CHPe4iSQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-14T23:49:28Z"
    mac: ENC[AES256_GCM,data:R8cw4lMSaI3Gjmii1rimQ0GEC3VK4eARjPpGehE/GoNMoFGMracnOwEToBAK9iQQwtHp3i48Bc0LoUt/xhG5ajbTUW7x/HzxnzFsRfrfTizfe4C7fc4B6gIp7Jhw3RVxOODVZHlbWcIJbQRJ4quS5vLnj8yGO29E+cDWrkqB3Gc=,iv:EkV1MXpJNdL2gY5s76QwvaFeb6jS7XDDhJ53RnRrofY=,tag:EH+1IuBztv7JUaNLwu7ZOQ==,type:str]
--- a/secrets/noximilien.yaml
+++ b/secrets/noximilien.yaml
@ -11,29 +11,38 @@ sops:
        - recipient: age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4OGQ4cVBHMlJiYXVYLzlC
-            TERQbm5ja0RiWUYvcVhSYzJURkE2SkxuZGxBCkgvNW9acEh0WGVEK1pDaUgrTUVz
-            M2NzY1RESHk2UUVoZFRvY1BYckVpYkkKLS0tIFVwNWl4NGU5VXNIRHByR2Vkb0hU
-            SWFEZW82QXZMRkVISGY1MU9jaEJLNm8KoHLDKI69uPhaIydeC18HTuOaWwDtyoUn
-            hGTcZDPDP8yw1+/zH1lGn865STnZGI0GO+kh2s2DWLEUXHK9GMrnJg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiQmRLWks4aFBVZDNCeFNm
+            NjBNYzZueFEvWDhaTS8rWU1hMXVid3V2Y0drCnJFdllhVTBRRmhiNVg2UGxpT2VE
+            R1hhWUZvaDNuZXlKdlRiVm9GcEthUEkKLS0tIFpsdm5CRW1kR24vN0Eyb1V6NjZP
+            WUlDMkZYdTVISldqcjRyL2w0MExKUlEKbKgd8yrDW5ZiP5/iiB0qdBjIiq2ebJUF
+            StuFW1ci2XCz7DWthsCPyuZHNwygjc700F4vHQwNez97g0q94Vri0g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5aDZ6YkdrYW1pRHlZMU8y
-            cER1NHRtQVZpY3VtSTRXUkhYckRZZWZuZ0RBCnZrdEZ0NzB6SHlxU1FhOWRLa0NL
-            Vk50YllpdVVEQUkweHFRNUZuSXVEdk0KLS0tIERGTzBxTXpoN2E4b1ZtQm9zd1g0
-            OUNXcUZrMFFEazRUa2lsSWRCQkkxblkK2s2Msm7k0qj08WqVnKR9IvU1vAa57/Ew
-            wGTVMlWaoUPXJ5CkpAG+PEoDbVaZDISyap7PAKUjMBTMh6T/jBhExw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuM1VkNUFsRk9nQ0t5dnVV
+            SFdCMXgyc0ZkYkRVQXVjT3hMMUVMdlQyN3c0ClRJYlBpTWY0U1FieUR5S3NLMFlj
+            anRINGlQeHltWjlwMzZZWi9Jb29zc3MKLS0tIHJUd3BYbm1RN0FrRkJIc1JpQkor
+            WG0wcE1keU0zcm5aTTRzRWtnTmVNaU0KO0nhgxBIFatO10c80yKC+RMda7WIknVo
+            UdT6U7rDOvtCH4z6hpldrlBG7r9iT/OktZ7WfDmbk5dAb8Ph06qKJQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6V2g5Wng0MWR2cWdNUjds
+            WlE3eHN4REdYQXMwZVFzalN0dUZ4eUZSUWlNClB4Rmlkd0dBNm1ic08xazJRalk1
+            VzVTWGtTSzBObVNCeS80S3F2RGYrUVUKLS0tIExVZS9KMzgwOXpZK0FzL1VzTUEx
+            NWNrUnZPM3h5dFNtemJhWGo5QjA2ZmsKE7vL4V7WfcxkZVGLRriJceGQlGHVu5cx
+            9HXo11gCf1QiW+cDjhclGGL0IEIsF5wOtXnePtL5AndkU4iEpunvuA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1zh3nmy2a7s2v7g9t7zg56p8sjqwmvqv5s7dn2v22x5nxyl5wfdcsaf5tw7
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUZE5GQ0JYWGtONFNGaEla
-            dFg2ejJxaUdwOXhDVWdxanNkeG0vOFFEcURNCjVpcFFMc1h5cG1yZTFHWk9ETnNq
-            VlBvUERpQWxMRndYcDdqTTB1Y3hKb1EKLS0tIE9iT0loSS9Gcyt3ZElVSm9YODZ6
-            SkU1Q0NZOGVXRENrOThBT1lDdGxWWW8KtypJmkOVD0Ej14fXZzKzKrnPNv7O5SAp
-            jdQe7GSwCJKqqHuX2T/E4mzCVrSPsB/GVfqh0IymZg6NJZjYO79Wbg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUblNFakVZMDVlNG9iMXNI
+            STRERzF1VGZmeU1WVmV6ZnNpYlpLblR0WjJZCjNlZnEwVFR4d3lRNFltK0pjT2xt
+            M0xleXp1TGJ6OWhmWEdJd3JwUVUzRjgKLS0tIHRZNE95U01meC9wMzlwMnZ3OHRw
+            Yzlrb1NNNzYyMjZnYUgxeFFML0R3WUUKfWr9rtRHlICOHW+yYC2ViQk4ZwpgZ9/+
+            wy3ekkQ0qmnaNXDVfxHOakZC1/p2wHqp2f6xy/Epgj6RxDkikP4gAg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-15T20:59:15Z"
    mac: ENC[AES256_GCM,data:2AFjhWJ7JriF9Mmj1cbHlVCOdyrLvWcEyspH79xWB7CauvI8sWafZd9yO4nq5ZxwOFIZxulbWADNc8oW7y5EhLDZapTwbxEl9GDhOm8O2z4HUrbXtXoQVRcjJFCE+17TLXBwsbLu15ji0xMLgfmVBoUgHntIFcSPID3L8FYSdLU=,iv:bWSLlTsdlIAE5Rujq22cLc8xWGrU8jkNtd2NahdOzl8=,tag:nxgUbd/A4gxPeBpCmSfzzw==,type:str]
--- a/secrets/user-pbsds.yaml
+++ b/secrets/user-pbsds.yaml
@ -9,20 +9,29 @@ sops:
        - recipient: age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzVlF4UXNZa3E2OWhPbk50
-            MkhCZHV3N1A1MkpmQkNUbUxoNWk2QnRwSVg0CkQ3NVQwcXMvMHZjY1dkajJmQnd6
-            a2hIWTRxVUxseFJTQjBNZ1FYRHZnT2sKLS0tIFpqZWNyMXBaRWJ2SXdJWTNKZjA1
-            ejNaWlFBVDFvQWdYdXFaN2UrZFdZQ1UK+ogkwat1CzhZ3DoJT6mg4JkC9B3fPc3H
-            G21mzWPyGS2L4LoFw8wmE6ynHzsGojAlFK+2VpE2oWM+yR40zRO8Cg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBma1lOWVlETG5XNm1WVEhw
+            YW5ZOUZlVGtHcEMrdVQ3Y21oZDN5TVVuWTB3CjFlek9zdEkwVUpzSnhMc0RadE1N
+            blA2UUdXbXJwMkFTaTZwNENSSUpLVXMKLS0tICtxUjN1eDA3L2RadWNaNlUwWVpr
+            MEk2bmtDenJJTzJvUmgwU2dTVmUrMlUKf15Ol+K76XqTiV4ISx5aN31TAqvAGzhs
+            m+VWiUCVO2I6lcHJ8eRxRSj91uI7v6F17HiEcckgCsvMWNHtO3rB/g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLSHowTjhHVVJIVWt3SWRS
-            Y2wwaTllOG9JMHhWcW5TVnRZU3d1RjlEVXo0CkhsQXFEN3kyRFNvL3lzY2pQYmVL
-            a0NMdGNxclU2ZW9rT29ucmtGdXh4ODQKLS0tIG9KYVhoSEJRdjhsWEplZVJtb1Av
-            bVVVYjF3d2ZyYTdWRTI4YTZ2Q25idHMKKB3XdEYu4SDrrM372Aid0cCio+TrqCqE
-            dzpIzCu9Kju4ECa7+1DwgAo37n0/YIcXCX5JrWF+qxIaetAyMkJoEA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrWjRSaUU2ZFdoQllnZDh2
+            Zk5NU1c1ZUxyc00raitIU1ZyTzNNRXhkOWo4CkgrV01JM1NwS1lrV3ZVNVJHTmc2
+            cUFSTXhxdEV5ektVaHhXcTBWMnljREkKLS0tIDBLeldqQ0x1cEhqOUhhWUpJNVh5
+            dFlkWEsrNHZxM0F1dnFvSmFvcTQwZlUK+Fiqqz/+SySPop0DdExO2nnrP3MUV4U4
+            ngHjLp7Pgugkh32YBydoM3hkeyjgcmzvSqOybbWIqWPyBg0ZyMKcsw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjZGlMWUt2SnZhb25UQ01E
+            eXVBL2tFejQ1cHNKS0pZNHJNcWU3NWJYWDFBCkc4RHdiUitUUCtWQXU3ZTNrOHVr
+            a2ZmQ0NEQU9qVkhzT2hhTk1HOFUvTHcKLS0tIHFYbUhzNXllTHRZVVV2YnFueUND
+            eElYaFdHRnJCL1B6TDRBdHFlY1hzS2MKYJ0ShoOUFK991Sva/SKkQQrCsYRf1TWA
+            j6RddniZt7A4y8mt4g3bhWyf+7OLLNx0BjuW6c2aVoMi7B7ZLBz+gg==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-10-27T17:16:46Z"
    mac: ENC[AES256_GCM,data:0I5IhUaaXWXaEj3TKtLhlDN7SkhCQouUcpb6bwnsoWVibWvMX9ZrqVO35wDrU/vmY45RTuIJ0AdXlDCL0fyGIOpw4bRoizxaIH9Im8sxh47Fgh+wY4LTEa3y6rES2opuaPrPUqEQeBtS9e1WU0Vt1Wdjv1nxq+pxKKL7p51CW6s=,iv:HZn7Ehqc0fpSDx32OgwzQZ3r8ebhoE4Dy+qUeDXJgj8=,tag:uj4lX4CESO041rLgRXko7Q==,type:str]