From 5d50a9807e9ebae758c3cc2883f7a3d0e8a7fdbc Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 21 Jan 2023 22:37:56 +0100
Subject: [PATCH] sops: reencrypt jokum secrets with felixalb keys

---
 .sops.yaml               | 10 ++++---
 secrets/jokum/jokum.yaml | 62 ++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 3eb0f9f..8638a23 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -9,8 +9,9 @@ creation_rules:
   - path_regex: secrets/[^/]+\.yaml$
     key_groups:
     - age:
-      - *user_danio
       - *host_jokum
+      - *user_danio
+      - *user_felixalb
       pgp:
       - *user_oysteikt
   # Host specific secrets
@@ -18,16 +19,17 @@ creation_rules:
   - path_regex: secrets/jokum/[^/]+\.yaml$
     key_groups:
     - age:
-      - *user_danio
       - *host_jokum
+      - *user_danio
+      - *user_felixalb
       pgp:
       - *user_oysteikt
 
   - path_regex: secrets/ildkule/[^/]+\.yaml$
     key_groups:
     - age:
-      - *user_felixalb
-      - *user_danio
       - *host_ildkule
+      - *user_danio
+      - *user_felixalb
       pgp:
       - *user_oysteikt
diff --git a/secrets/jokum/jokum.yaml b/secrets/jokum/jokum.yaml
index f499103..9190aed 100644
--- a/secrets/jokum/jokum.yaml
+++ b/secrets/jokum/jokum.yaml
@@ -1,12 +1,12 @@
 matrix:
     synapse:
-        dbconfig: ENC[AES256_GCM,data:a0Bq2ilDZM0GddHZS1WcaSY3kdFDbau4BNMu+rumisYZy5/VQOE6LT/gq3vdwH2T7D3r1/cj7YSRcdjq+SRYHiJ9xgb1m3tx+ZlvNrY8PMaYvtmOpMoXyYlJ2iT7/IiMk5UW50cSZEcww7zS8NknZMzjiNEq3+D88J57J6WRmQqj/w==,iv:BsbOLl/hlQIjOLnik8lZWO3+jhMEZ//fisxLon7HdE0=,tag:WqMGflg5+Sh2zx5QFnjy4A==,type:str]
-        turnconfig: ENC[AES256_GCM,data:lHySrJUpQKAUXsl9LzYlxu4YSCz4qJF6MRLr+LprTEdhGvrnk7U=,iv:Jz7LEOUwTI8LCMOKqB2vN/0Zs+S0IJkHY3wpAC0q5YI=,tag:8KR7duN+Qqpl6B40hSEndw==,type:str]
-        signing_key: ENC[AES256_GCM,data:6RDZWsrRKDGTefIeZZ6UVlcoqVV3fdRas/sox4WkEgtouCh7lwwrSzpuM5R1H0cNVxA/8wBsaHG1xQ==,iv:TDfAdYROu7o7FIwn6oOs60surQ7zFy0+9bqhx8LtwXg=,tag:RNzcTYkDuyz6nz2z43CJwQ==,type:str]
+        dbconfig: ENC[AES256_GCM,data:R7y+867fwnVXHaknUj9RpBtkEATfUo9AoaNId/ODLkHCJyQP1761pJLqeSkQTZAnzZxqACYorV0P57tEQ5bE0aKLOL7tSClx82x7Tki0MiWME4FgxJC2fQk/vP0Ca2zufnw0s697zkfsnyx/1pjjo69amXc207NXAHCtxXO0ztWp0Q==,iv:BsbOLl/hlQIjOLnik8lZWO3+jhMEZ//fisxLon7HdE0=,tag:6sv6ySztGbxAgn+WV0I5NA==,type:str]
+        turnconfig: ENC[AES256_GCM,data:eyUQID6nHiMH1cm418ItI3DEAjAPoR9NR7DvhfYCTvYM1LyHKVg=,iv:Jz7LEOUwTI8LCMOKqB2vN/0Zs+S0IJkHY3wpAC0q5YI=,tag:4SImxB+5JI8VtsZVy0cYIQ==,type:str]
+        signing_key: ENC[AES256_GCM,data:3EeV+9X9TtqhBL7QyULTS7tNyH7ayhe88B7UtNZ/TMlQSW2E1WtSVEecqs+097A1SmdKoYVr6iz0ew==,iv:TDfAdYROu7o7FIwn6oOs60surQ7zFy0+9bqhx8LtwXg=,tag:8MpNBw5TbDMxXHF9+tmZfQ==,type:str]
     coturn:
-        static-auth-secret: ENC[AES256_GCM,data:tPz4GUvJwB2osO2vwyyThms=,iv:MVoFWgqHm88JXaCYa5l57SkX3fSmP97Z7IzvwumHWY8=,tag:af7Qs4qiSYQ/OBLJbZGk2A==,type:str]
+        static-auth-secret: ENC[AES256_GCM,data:bDVbTU3QaanU0fPhQF4Fil4=,iv:MVoFWgqHm88JXaCYa5l57SkX3fSmP97Z7IzvwumHWY8=,tag:ZX121OshXiLC6eRxz2Be0g==,type:str]
     registrations:
-        mx-puppet-discord: ENC[AES256_GCM,data:jrFvjgWG3qdM8ruIehfBP4WfSUFJHA2SabhVFNuUCWk2HR7Q+2PSGrZ0h9ikFnJhZD5JO0hK5AiYJQ34MWaFEKuOqV1DGOf6VCr3QgeIItvctQyS2DD+R1zt5a32KIJOFMFbH66c/X3POY/ZMsT7UA7BcvqX8uB0Esqa8wRqV4wmzGOmUp2v4uBTihr9O7V61m0t+kSYmMgZnJqmGf7b0/FM/dmTxcp+qXrnRPz9JCNCtYKoVjDUZFNlBKrppDC6GjN1y4cBzzVezlHKCk53x71T2yberFRcK02Ni9RLoH0yqU/1jt2gjaQHal52wF3QxSXKT9rtCGZh2o+9Txpp61LNqBiua/Ija+9ToALlP8ihsFDv7UZ04g5y8u2A5mC1HHB5wU1E94ay0NcYasfdBOwQqpwqunQxjvp1cHHnspUasXXwWoRr7faxkKhBGVoCA5yNsSmp8+4zWjkFendRVZan1UsJsJ8me1nOLji4BKAevh3FzagLjjtANIoNqKr9kGBfDzIOCgPGzBLlhJcMZPwZCV/QNbs583g=,iv:3gzyGz7T9PK/J92X46YXYT98bpTnx1uPiiwXuls/kOA=,tag:O+bfssIhPDSKRCpv0YPxTg==,type:str]
+        mx-puppet-discord: ENC[AES256_GCM,data:nvWSaZ4we8BD50Op/bZMrlMXGBwzvG3IXGPGJe2paCZ10tTm9v4+aYGYhILNhcQM095AD9KdEJ44TAyPxZ/c5iYLqb/LJzEpa5X2jKoiF6r7PjNFGevKQs7fzJk4Y9MxHwZ2KJT+uHjtXF8erJvFDs3S3WgmuAQW1U9b5fYQNc4ZF0tY+BsWU2ehqMejpx7w93TkcIiZY7Uoj4kPMEp8aI6v/7VPIjM9g7b+R5KGZ1/yIpiNCzZuT+x2mxCtqGfbOynWON8PaCIojp7sbLaRWhX2bd4GG2wP3T5MsgwjJzQSfyXjK1Dyxzr8fVmh0R2mJoZHTYNQLLwYncLwqXQEHr6tXNWPTwxPslW+BdLsp/8//m0F04vUf4Z0dbf22NSaPkH9GdRLB3zXh07VxqG+B7OvAjDULHUmA5uwgtZq9h0G73TWDJ8U75eAxrTdsgQgmIsyhpLljFW2QSnOPL/93ieovh5qRgXjgyqrljDOkB+fhC0gdQalPeBM8l5zPI8aaJsVp/l15rx4nUIrFka0g+v+SRhAIPtQAKA=,iv:3gzyGz7T9PK/J92X46YXYT98bpTnx1uPiiwXuls/kOA=,tag:Vm+zNmA53HIb2dP8FIgP6Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -16,42 +16,42 @@ sops:
         - recipient: age17tagmpwqjk3mdy45rfesrfey6h863x8wfq38wh33tkrlrywxducs0k6tpq
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3K29HWS9ZRWxpbzQ3d1V2
-            OEZwYjA5eEE1Z0YrM1o0YnlGbGt3QmQ2YkdBCkpnZHN1TE45dWxqY3lndjBYcWVQ
-            cFdoUi9WaVNibndWdTcwTDRiOTBtWXMKLS0tIGNIYkdIZWo4cUlrM094Qi9KTnJa
-            ZXI1bnZlbmZZQ2dvLys4YllYRG9jNlkKn2UbGP+TOUU5+Q3OQuZTQvr8S5oDX/aN
-            a7iaQn2z/Y5M3tGvFBOiaWZjqtoCHgtZL56LKAaF60yLeUIPnKylbg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmdExVV0x3TWJCTzlCVDI5
+            aS9iYXRXcFltdG5FL1B0U0NITDlQTFRsYzBrCkpSZ2trakdaUmhyR0R2Rk8zRXJz
+            RHFHUVRRa24zaTJKaVBiQVpoSVZvbkUKLS0tIDRaMllWdUEyRVJwY2M5ZTJmeGJ1
+            ZDI0U01ENkxVenhseXB3bjhoRHZQZFUKEH5jX6yjr4RrkTzusVge6J4HDqNOGUWx
+            GUPtOWaOioAdZN0Snu5nBu8f9I8vbt5Ry059CpFF6agsToIp/gbyXw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1n4vc3dhv8puqz6ntwrkkpdfj0q002hexqee48wzahll8cmce2ezssrq608
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBISzh3QmlzempEMDNsaTQy
-            bGxFZlNLdURhY0NzcjhjdlgzZlFxV0R6cURnCnhqRUlpcFNPUWd0YmF6TjYvK0t4
-            UDVlcFFTbDByTkRZTW9ITC9yVVlzYUkKLS0tIGtkWHF4enhrK004RG00NUt5ZlND
-            TFBiblFGNkdHZkk1L2RXdkpHSGQ1U2cK/mBTDDHOWSGZRflIsxOyDWShQH2EILJr
-            jCrLGbIaGgphIgLCHVmMV8QLRPK+8f9t8KZg7sczRViuDwZsAx5vPA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCY2FDRmVSWDZGdm95UGlj
+            andKY24yT2EwUkhQcURyajJiTkk1UkZVMXo0CkZWUS9ZZDFVQTB0cnpCWS8xMlJi
+            RWYrN05EVC9RSDN4cHdtRjhwZXBTczQKLS0tIEZwQlBGeTRSK2o3OUJVdnViNSsy
+            a2tNb3hVcW1td0lLN3hCbnhoS3dnR28KWp0dnEj7eH26PrSb3rHHIgnPnwmjkTeY
+            gyWPXnntuv4Ae1apZ8/7sb0bWA9ZK63VvlRzT3k8ttMpz4dE++t+mw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-12-09T05:16:09Z"
-    mac: ENC[AES256_GCM,data:MSKUQkCDCEOcl9Eh2VH9ccZ3Ux0eIyJFyjFVaJZ5WQA4fIB1J6Y/EoK/q7iaLFIH8YkeVPIvXVu9eCXjIyQkSugJwQXk+gSFtssjegUBTcZkRJJ0Lo48IWO4yVFXnDYzyFjcgH4TBmL0uco3BkWHfLHR46fQUJIco9yYlVKtsFU=,iv:d3uWCTVV8o1Nx6WJCF/YQHOeGjTzJk6xaDxMTWeUINU=,tag:KOi1naN2Uhe0NcMl6oW/6A==,type:str]
+    lastmodified: "2023-01-21T21:36:51Z"
+    mac: ENC[AES256_GCM,data:bigb40nyFgIa/HeTmOgAT76z2dJRgxc0tG0CpbvayL4e/o9ctKMpyjA2ogniJfZmwieLv7jMUaq7oR6TZRAmwmO2SV4V+I9z2WQSNvsa1v5IRP+MJcpgZ9yft1SKkAxDgyjizxULs+0dB3/IUI409CetKUAu4CesSWOJxP8+4ZQ=,iv:ond6CECTL+1t6ko2YL6cdlkds63gOJ1qqP38KPEPgOQ=,tag:ihfOwU5+mT6DHxGfreSpdA==,type:str]
     pgp:
         - created_at: "2022-12-17T23:05:08Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA0av/duuklWYARAAvQ3TCvGiu75Swvd9hyY8rw2TeXiKPbHESzXFSZdR3+wk
-            XkaRTPuxMot5IUmUhC4EWxzUrKKyPsfw685FpojHDUeOWzaAcnbTT3NVg+VoSIAl
-            pDnt7BUZ/23Hd0tYt+VJuX8S4Iqny6xnhzWTaFNrLFhPGvIN3XbDqEsWRLQk9s46
-            rMht6DJkz8itsFTJrwmg52oXP0mIlZkaGFvWBNZlLf/0PiEET4sjZ3cn4rRGRNhf
-            Zk7u7ZgrBFRib0OO/edN6zFh9+/zbculXucqlnvccm6BQluHj2Z66++cyyzEL2xY
-            eU+8sBNWWKHPusPhKNWZsUGQ30fM7Ctdri5PWOzglJ0Ah+lAFgmbqdcSHjAuF9f7
-            9YVA5G4b7B1vT0dCv3MZ3419Gqa9Vimi1xUw+9SbZjACpMraovUKshTsKN/9rBzY
-            YkojmBdaneMoFGvo+aj5vMxG8CJbPV3Oiq1+G0E/fj53W1Qi8boeqcLxw5IbJIbq
-            27hQYm2L1gNBg84cEJfzjtxqPkP4IMb5DOZYo8hNVbXCP4AYjgyecw4tkSnbRkB9
-            GaRYSx2b1HMOxrDnzRUx8cX26a/eNlLhictPUy10Dvcs/xfWzGytL/3AtiAeaIY9
-            4G6rWuUv6XqYMM20bMc+HnKaFpYq2Y98DuLCqddrek8UaMX2b1p1Kw1ebC1i56fS
-            XgFIdcQDWiMi8rsWjAoFE7CDe/FvyCNSE88pvwhH2/BQjowUeMLqqqCHbrEj8sgo
-            icW/6tsXZ5ShJ5bi56Hal5FsAdR6sXTTdm8nYSFdmIfSHUz+auZ41WkLJYXpuFU=
-            =EVJD
+            hQIMA0av/duuklWYAQ/+OIPbP5T4QnJoF5jgiOM0TXzKpOf5GODF3Sr4ZEpFnDB5
+            29ehYbGgkRnP9j01UJtksKA7LCeZjpvjnBXxBnxG5MhuG24BtWTlU3fjAjSrHZ7g
+            Hn5EaEQGrCdQwfskCqROH2mPmLmf5wsaMLCJETJRBIol06ga0cuiHKJLUhCOcLgB
+            AI/SXVBpftq/ZBwmLATT2lfAD8ZMEwEE0a72aQZJQh7LiCjJhfiDRwnovpE9F7yu
+            FT++ocU9BD5dHLlsqepFXmCQAHItu+bEeVhy4lDVwtBB4f3LptePCmiuB+OBLvZX
+            z9XuSwljJVUKHP8P7F28nLHCAI6YOVer2MFOqnuA6a8PLp8IAadyjhcbuArWiJ1+
+            7tLpKOk1ZZL3FKCz9SF2bVtzClAUyv8qAk8PTzmsxQkkrU0k7muHPO6EE7mj/VLz
+            51IWfHcwLrSm1fifO0tShIvxtzXtywI7/bcVUihpAHCqnIuqnIEzpy1vXYM7impG
+            OlBzfWIEQqFCqAomy98fGtuyHohOahusjRbsmy4rshqfQ0V97kr3ZAp3nZHwssqI
+            YJnWI0WaO8S/O1EgaAAX+ycv2P5vLc7cg5V6mgo6CTLlDjMYppi8oRHLSQACgewY
+            Y7ztvBi1/Ey3bHHX3rsV+zrOLaq5P20qaLcuLQPZfH8bp6nnuqAT4OejKyKFbVTS
+            XAHpyvFTTr2ifyxzOuWk+kOKL7cJdwUkFIHSK1ZLHElt7bkW81eyxinJDyemW3Sf
+            j0F5M4G8MH9RvnfumCSwjA3AGvrqQBSaOD4jL/y/PVx2ZKh91RpcdyAi7qC6
+            =AZGW
             -----END PGP MESSAGE-----
           fp: F7D37890228A907440E1FD4846B9228E814A2AAC
     unencrypted_suffix: _unencrypted