From 48981c46e2dc28d24ece4af50852b4f2f508d55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Tue, 2 Jul 2024 14:30:20 +0200
Subject: [PATCH] update secrets

---
 .sops.yaml            |  2 +-
 secrets/shared.yaml   | 82 +++++++++++++++++++++----------------------
 secrets/thinkrac.yaml | 52 ++++++++++++---------------
 secrets/vf2.yaml      | 58 +++++++++++-------------------
 4 files changed, 85 insertions(+), 109 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index ee4bee40..0d26cb84 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -4,7 +4,7 @@ keys:
   - &thinkrac age1p400545a482fma40yfgytu40p6wr5a75v4f8yeudvgf7eh5erufqxhgynr
   - &nas age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
   - &instance-20221213-1915 age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
-  - &vf2 age1gtezxkkfhpkv788x9dek6s6s342n9tkl40zvsa48m9a7yqn25fnsmd3wy0
+  - &vf2 age1emv3kzvwgl36hgllrv7rlekqy3y3c6eztadl3lv09ks3z9vv6vdqw06yqa
   - &rainbow-resort age19vzypddhexvvsf8xylstxc9znnkd8rxmamhjlt7elvz4j3zaf5tqqura6f
   - &devterm age1sqvl2cwvzeztuelpwppaestqufzeap8uf0vgy7t5mzr9rwc3dpxqhx8ly9
 creation_rules:
diff --git a/secrets/shared.yaml b/secrets/shared.yaml
index c185eab2..abbe71b2 100644
--- a/secrets/shared.yaml
+++ b/secrets/shared.yaml
@@ -16,74 +16,74 @@ sops:
         - recipient: age1273ps5thcy70ckdt0270s2nysqgu48t38pq3wq975v3y7mf4eavsw38wsl
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZb0x1NXduWEVWWWV2b1I0
-            K0N2dngrTXl3TWd3Qlc4dklpUUpQNXhHSTBFCnNtRCtxZTJaY3I3cjVKc1NNbXlM
-            SjNrRlFEbE5wbS9EM1B0R0UveHYzNFUKLS0tIExERUtyTjFzTmJrWlBUaExZRjBn
-            R1B6eGFHejJVanZLU0tvQmFHWE42Z3MKrf04keBxDOm8A911chRqiJZBn2dXrV7s
-            o0uA9pRW7+39t4nd38O9tJdNOVfxoayAzJmAdcCw1XEqBWXxySVVgQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLb2tncFhTZ01DbXYrSVhQ
+            b3dhYUxyaGNpa083aklWVmY5MmxSTTlJUGwwCmZDY2tFRW9JWjZPMHFtc2RpZXdQ
+            OERoL0tKOUZpSzM2MExvS1NhWVYzbDAKLS0tIHJ6NnpiMTZMaFBXVWp2TXduQVF3
+            NWRvVlQ4aXBFMEtPci8wREh1ajl0SlEKQUdwD3R5erechijWL1hMQYUxG8MzMo+I
+            J4KJpMWF20Tloj6f24zChk7yVAq8R3r+qZnHr25WDxPHhPheYfEA3Q==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1p400545a482fma40yfgytu40p6wr5a75v4f8yeudvgf7eh5erufqxhgynr
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvWWNNUmNic2dTQUVncnZE
-            eUNQWGsyejRTM0F0TFVFNUQxV2dobWRQZkdVCnZBTFpaVVV6ejgwNjlYSy9lVU9H
-            MkwwbGdLd2NuTlJpTjI5QVZSdVVtcG8KLS0tIEp2Sy9zVVZUUldIc0lERjd4dkgy
-            NUlCM0JtZHRxd2R0MVVpd0ErRXp6THcK32gPfo3PuihVKTs6rb0HxygtBgBi1O0F
-            9A1ubei6mzdka2oCjbusdSLFagudX+YUHtf4QFfDFB13y4wiqggJIQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoVmxGbE43aWtZYlVOdStB
+            MGdIM0tFdVJKRlNLM3EyaFJlblBCQUtHUFRBCmw3YmxmOFROWHdjUXNuZGxMSHA0
+            cm9TYXo0bm9kNlNIc3VlUmNjU0E0OWcKLS0tIDFScTlNeStyYjlOU1lDcmg4YmNV
+            RGxBVEkyOFNjeGhyNU8vVDJ0WEx6ZnMKkbFzC4qNHM6beQPdAAGLGlQkWhC8gvUE
+            zQlWgvd/tUq4LBPGtsxIyBgeXcywamfghcTMoKKLH2ZOnpIPhbcetg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRQjhqVisxRVhlKzc5ZTlW
-            ZkdOL0dOUXRud2hBVlBWenAwNEhRMTZQNkI0ClFqVFQ4RldZZjhYNGRuWUZCeGNH
-            NzdSUElJekhNOTBvUkNQZllpYTFjREUKLS0tIDBrUDkydUlhT2FCaURSdkE3TWpH
-            dVJ1YWVnNjc4OVd1T3hiWnRISnVISXMKPx0kAgWPSN5UBtXYcw1bB+N4UVamg944
-            uZfgs/u60QE/vjsAru9DdrIpnt36+WA9PX4d6rOtIDV6/3/Xx+y9eQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUcHA2UzM4OWtTU1dXeHFX
+            amhNNXJGR0FzSlBwL09VSWlHMlpwVVdWTHdNCkwwNTkvRFFSUE1rYkovbVRmZzJy
+            K2NNWEE5RndYaDY5b2loa3FnMldGdlkKLS0tIDFGejEzUEtFSnlxbHNwQTRPOG52
+            UGI5V2dQQWRUazBKZXZFckpjYnlOS1EKZBWTKR6AXdjf/ekOegXFMN4Ys45IEz7q
+            9+cvNDhTz2KoUrGGk7lI8OaXYmhky/zPXx/LExOr57ivl8rTY/qhhA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBRm5aWDJZam9QNXdLaklC
-            L0RmU0hIR1lxOUE1a0NxNmV5SGVNbDYwb0YwCi94elYwUlY4aVRxRlE4YlBTRGNO
-            RXNPUFNkU3R5S1k1NnZPcDN2a2IwcFEKLS0tIFBiRnN6eEc3MXhzeWtYUTFWS2J5
-            eHlTakJudE9aZHBFWm1OaU4vaFdPa1kKBXuflYzQin6BR5RlgUIYdq9qxotZLy5L
-            h+qRmG6TLYXaqR9XbYS9ZZlMy/wWCgt8znXE+SE2jpEs2zIGwAMjLw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmdzNRSlZEb0ZoWVZUZnBX
+            VjFGQVdiY3RtYnVLWisvUTcxdmpjSGIvR0RRCjVqaVE0N0RwMWRkeHd3SVRkZThI
+            T3pXOFpSaHIyMURCbjY3UFd2U1BtczAKLS0tIGJlaXVxTnhiS3FWK09kRTVlYktO
+            Mm1EZ212cXlwaGJ3QVpWTS81NG5EbkkKTKGDsNBQkeYkPj0Tcl1PM8c9m36O2Rp2
+            FMPhOMJjdLjlQGZGc2nliDsIAkCkvJaKBw5Miw83w/2SAExotbqYMA==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1gtezxkkfhpkv788x9dek6s6s342n9tkl40zvsa48m9a7yqn25fnsmd3wy0
+        - recipient: age1emv3kzvwgl36hgllrv7rlekqy3y3c6eztadl3lv09ks3z9vv6vdqw06yqa
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvSE8rVy9GUnlSNkpXdjV6
-            SDkyRmJnMmpVRmZ6V00vNURvYllTakJnSTM0CnpQWWJ2cEU0dmlIeDkrSG1oREhQ
-            TFV2RUJBMGMySUhpVWIwaS93TGNQOVkKLS0tIGNYbEU1eDZyWmhSQ08xbTQrY1JJ
-            N2krNEY4d2FYRWxRdXNjbWVGM0xtTkEKDOQ+8vHOcoOwlneHft9bR8fViH3hFTWo
-            nZF1Y0hGMrR+fP5DNfW95AzlXivg9iHrrjPvblwMjHPoaSHArrRL5g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBta0t3bmRwS0ltMW5ERDE1
+            U21oNW9jbTN5OThUWFk5aHhhdDNnckwzM0NrCmNZVFY5NmxRV3RFQldYS3V5REY0
+            TWczUENCeGVwaGk5NklnclNCNHlmUUkKLS0tIGlmbHVzTFJYcjJOTGMySjR6NUNY
+            akFTYlJBZlRSR2p0YUdSN1J0MmlJVzQK/ifkaaTldmlcrXkgSnqgwgSn8BACq++V
+            V+oYS8TeLAjooEvRzOdHgkXNsUwQUMHvSjCVc4rwZQNF5h5kcQj5+A==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age19vzypddhexvvsf8xylstxc9znnkd8rxmamhjlt7elvz4j3zaf5tqqura6f
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTa1JybFRiMkluMHdjckdm
-            dGRPelgzQXg1NlBHTS9DUmRXa1ZSdUM5aTBzClhoT3VXM3NSSVF3R0F4ci9KM0pn
-            WFA4a3l4SFlJb01GNUF2cFUxM3k0dDAKLS0tICtqRk1QalJLV0VJSnZQbjBtR1Q5
-            ZHNlMUZrRk1OV0JzNm90S2hIQ0pVVlUK293IBzXWUM02iWSq26cRcSjPZ8cAGe5n
-            RnpKrXzmGVLbQy8wmZJ9f3jCQauTRCJntfY7PsLRsoBNk9ttKBo5og==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3RnVyOURXOW9OaTBkV3c3
+            SCtkQUg2eTdkRXhSWTl0YmNPdmNiNm5URzNJCm11ajQ1V2ZJbTUxVmRNR0h6blFR
+            ZHQ1eGVvUnExdHNLSk1Wa3ZrSkZLYjQKLS0tIHNnbUY3WkY4VDM2TjM4ZW54bGF6
+            akRzcXJlejlRK1pqdkxhbTdjWmtKbjQKyhehQno51yoVB/qnNZqD5p+ZHfKsvZS+
+            UNzrUqpB43Odigb0tYBsyoTwgel+gEuHMwmEOUbvyHqYKMGYQMEgsg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiRlRuOXNTcjhubUh2YmdH
-            R0pUUFk0NnlaNGdRMHhmM0VRcmNHYVFNUHhrCkpXVGQzc3U4WGVCUU5xS3VBaElP
-            Z25kb1pVa0NidjhhVUxGcVJ4dzA0U0kKLS0tIEZPNDlCeWZzbWcwZzJHVGFYNVd3
-            OW5zczFoTDZ5eVd3RTBzTm5SaG42SzAKD0TNBn85N8ZqrZmQ9jLDzQbQCYE3AzCd
-            okDRcZe9FkDOPuvD9tXzSU7IBGP7P2FHZVVJu3nwqWCbk4abpKrRRQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDWVJhbklsTFFNektEd0NC
+            QzQ5Y3B1bVVIUGwza1REMWxDdGFCNzFZSFM0CkVVaXRFdW8vd1ppWGsyclhKc1ZJ
+            SWVRd2ZvUWV6Rm9tTVI2c2hLV2xjTlUKLS0tIGNiT01WMlBGTXp4MEtCcnlhbnA1
+            bmRQM1JGZGFZdHlvM2ZBTjFnYWpPVlkKLNAZyxI8/cLJIjBzZSyRMP3oplakUxqY
+            dEmmVnicrc8L95s9/F5jEX7ncna/e8E6271EU2MYicJo6Z5AG7ko/A==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1sqvl2cwvzeztuelpwppaestqufzeap8uf0vgy7t5mzr9rwc3dpxqhx8ly9
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNVlJOODJ5STNpbmNJN3U2
-            eW9wK0FJKzR5WSsyWUlpQmZ4dlJaejFxVWl3CkRVSjFkaFZGMzNwcFhUNDJjNnVF
-            U0ZaSGJHOHBLT3hRSkxKRkJsQWlLZFkKLS0tIHRBT1JlellnWlBvZ29RZ1N2YmIv
-            Zmk1ZURFRHRzRklERlZUeko2MEhMYm8Kywgx/XOY6kEcZIwf87iXbNjdkWBc4r5Z
-            wexFfwnIWtxcnWZpIWwg1XGubL3AYefRvo7zyauJKx9l9hAjq6fkMA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxME5HYUoveWRscTcwdjlv
+            QklMc3hOOCs5Z1Z0amg1d2NGb3YvdFAyQkZZCmVRQ0xZYXFXbVVWY2Y1ZExESmg5
+            ZTVkTmYwM3hJNXZmVFlBT0tHQWZCQ2MKLS0tIFdtQmY2cWs4MjlXd25HZmZnb0h3
+            c3RUNzRscU16aU5KRGNlYnRqRGo5eDQKAtBjpzhJwhWFOfRCjbW86e63MlYAGDu+
+            kGtYRWZdwfoqmNVCxAIGDvQxdUzX8OUyHNySHBuixTFAXVRNKWWxsw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-06-26T18:06:02Z"
     mac: ENC[AES256_GCM,data:yj0dpoNLC3O64uhLmWCCouUwbPZzGMQ2kReSNAc9tYxhu+xRjwxJxI3OSRdqZg4ganE3CCCLXnFp9MdQirmysPuP7Fr8t9AHY+nBafV9G6Qb8ZvfVHvrcNSStNCng8XPoGBs7Hp+I7EAOlQ27sLCKKML4Gca0qoD7DNz8L2xmGk=,iv:ESlvozOaYpqjEig9wCF1RRG/0N7VHCpwrNW7JMoJvCg=,tag:TnbKUfJrr8uc6O7Y6T6cQg==,type:str]
diff --git a/secrets/thinkrac.yaml b/secrets/thinkrac.yaml
index 83faf835..9a04b77d 100644
--- a/secrets/thinkrac.yaml
+++ b/secrets/thinkrac.yaml
@@ -1,15 +1,9 @@
-network:
-    wireguard:
-        privkey: ENC[AES256_GCM,data:A/yMLqnSLVI4ApewHOdsctmGA0MoF6GBf/BFkhRAHnTHn+qLop206YKQzj4=,iv:JiYJ4D7J4Xh6t0vznJgYs79u5kd2CxjOyyJLw9GPHdE=,tag:TGxYZeEzTeRbfeNMHXw5DQ==,type:str]
-security:
-    restic:
-        password: ENC[AES256_GCM,data:ojN22sxRaaSjBJaLOf6S0frOrRY=,iv:ZIssZTxvyBU3WZmuhJ/kb5M72BNFDpOV5Hdxc2D5BCM=,tag:B1u1NJQr6gLCRjvfqGDjsw==,type:str]
 email:
-    lotte@chir.rs: ENC[AES256_GCM,data:MywN+Etfri4TQQ8M01+RS4sLCA==,iv:s4hW8oGPs7PwdtiBlkuRmAJPjHjBonHWdNTrtA+aJLQ=,tag:3Xp2kHMgtRDmItpa+fJ0Fw==,type:str]
-    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:iLQwJoW4sRF35M3dEIxKrqsAsJND0wVlfue9uGfZgr+filTkmfNsnzamg7eBfacURuJrHmGDXCMcjuH15GwONA==,iv:5zAeYL2YS4J38TXl0t1mLDxjAPdf4IpGogEuzYd+xJM=,tag:FMKvuq69uZrv1nUI/2erYg==,type:str]
+    lotte@chir.rs: ENC[AES256_GCM,data:DPoDDQbm5pNgvBtSQcgiK/mMgA==,iv:kJ9ORC2g8cB4lcsiK1e9ayg1VqZu1fyyY8OQTqtgrDA=,tag:lGNUIc+SGlln5pyFL+8qew==,type:str]
+    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:UvZ9DhNpuug7I5iuzCbxNI2h2XONgFB+tiPDb/r66yUdIih+KoXVFxwCNo657qOpx7ZTVRICmYBCqr4Ss1hT2g==,iv:mFyT1sO1XDhihl5PCKFAvYc0MAAGdOOsY3ymOQAPMTU=,tag:76Adl9u/F+GjwBrqx/2a5A==,type:str]
 password:
-    root: ENC[AES256_GCM,data:eSBWnHNSNH/QKshgXg8alw6mrHwky7JSAKMkseUNwhSaeMFRIBcXQSHg0BX8ZKqflLDz73kpNrTZ6l4IHwrHnInrkFBJrwjRDy3km5PVoB1CnEVux3mbykjm840gGRBan30w1g/2oJuLNg==,iv:C40BdU1eQncBo8mFv4a4IlAANF1yTx3d/J2CR01frUM=,tag:xFuW5vL6tjEtZN275/AQxQ==,type:str]
-    darkkirb: ENC[AES256_GCM,data:v7LPod+E/q533kd0CgSm+qLk+fVZh9H58zUDd44pu9KPQV6LlWYpIkFfAA0DOvaqGj13baF9teLaPhJaE1DWnKogtxHtCkWCoB6/7wvTAOe16i5XPZCY50bBUnYTtvtGoP6l3Uu+qyYNzw==,iv:slpBQ4DuzclqhqUa5cELy3dpk1wyH4EQclX+G8nM3Fc=,tag:BRIELfc3jNEGrqdEPElYVQ==,type:str]
+    root: ENC[AES256_GCM,data:SVE6rKw9K8bqcrQ8UkeNyEIlQ+Gux8E+HCKwzEzChru+Vu63o7QuX7KnNQU2lsbkj71qSImWe1C8VfIA5p0aCji+/qmTsgoCoMRBD8WhSitUPPfX/lf+pMSi4ELE6BcT7qABGapbVMq5qA==,iv:js3Y3hf9PaU3YcB4SWpJTVHSCvY22iWK2VJG/r7AYVo=,tag:ahyFsIqKqT4oyMqUW0FNiA==,type:str]
+    darkkirb: ENC[AES256_GCM,data:qAIu2guIVloiuUR1WcIlzHgPZEfr5dGNZ4d8+0HJ5+XJpsoY0MHZC6djqhNhUREU3bYtmWg5vgR1HJzGUvTbYsswV6Nbrj9k02O4/uLsNV5S/QONgJBRvysbR/a2cfSzX8yCLoaFGqjUpA==,iv:pZEu7FSjCftASGRrXLRouTKkSNy5sOEbI7S2IOHLyn8=,tag:smk+1iamN0QN/MW4VmHGCQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -19,25 +13,23 @@ sops:
         - recipient: age1p400545a482fma40yfgytu40p6wr5a75v4f8yeudvgf7eh5erufqxhgynr
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByckNORWFDQlNrSmV5YWk2
-            Y0N4Y1BYV1czSElUV2l0cjZEcmdWeGpwa1d3CmVSREJNdXdlM1ltRC9VRU0yajdk
-            ZEdMZzEyRjdHOGcvR2FPTk9GT0ZWaXcKLS0tIC9EZ0doUkVQTkI1TmlDQkg5N0Ji
-            NTI0YlNFUnczajRidW1BbXlxaXJsbkEKRoG5aHx0ZPURQE+o1uzCa7e0x6fZw+Lg
-            dx09pb4z+Qrk/4TdYlnmPmEUZa1w0Ic1ndfgsRvoVvFdaLBy51Z0Dg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYaDgwOHRTcjhEUWQzL2h2
+            TFBZQWJuSUU5NC9lb0gvQXB3dDZndDFqSGxnCjJtT0t6V2Y0OFdESlBXZVlYdTVR
+            b2plbTBPTVVXVUNMWDEvOFJZWlpPSGcKLS0tIE15Yk5vQ21kajNqdkNXdmNUYWNM
+            UHFkYVR2ZitXdjBicThsMDVBOVY4Z3cKcfG3loFo3r9Al/1Yj/ap8gQ/M6/g+rzf
+            meTmOIOi4ijVgGsYSD/e2RqyiOiK6b6DcgDeg8biIh357RGUW2sT+Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-01-17T09:38:58Z"
-    mac: ENC[AES256_GCM,data:D/aKnDfYOaPoWfH6N8hcIhYxoJB0A6r3tK6KhS3Jy3hI6HkTxvF5k+zPDw2sxm2I+QtHpOUFkEoiUDqQzAnQXkuMf9ZuTgsDB8rsQ4yLXPcqYL+DwnlYVfb9uA6tmAprd3GSCtUJ9h5gQF7ddzyLiu8BAvabqF471pdS14bJRMY=,iv:F1n+AYu1p3SsAomfrNtITsqpdAf+kptFFdWrI9GU3Jc=,tag:t2yxYBw7d+c59NNF68HvIg==,type:str]
-    pgp:
-        - created_at: "2023-11-29T14:42:09Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdAen7D9xSMUquuUTkq9GF/1xn07Vv2TyL2mGaqKLtDsRgw
-            rxwPajDNyHyo6QYosAgPqm4yeXMgQSlne3bPBzzBaPQ7uSQsovHCTY+cPQDybrYl
-            0lwBt9AOrWBUpf/Xof+QoVF6OxbMZk9RbmvagyebmCxvowOmhoLsE2KyEBEADA1W
-            nRhWBKHowLWrMoAjBNi33Ekqt0lAEOvfpgOcONUyyCY5WgN/uxQw+ECLs9LExQ==
-            =KL58
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBudmp2ejNwSm44cHNFcXUv
+            WUtPZFBiZUoxMmk0bzhxSkNxbDltVDM2MjNrCit6dUorZnBBK3FWRVNzclBIMXdn
+            OGtYNHZqUGhXem5NdDdKSi93SHF0SnMKLS0tIEFDbjdUNVFIMCtPN0dDcGRFWTlU
+            UjN1ZVlFUm1EU1dQMThHcXRybDhjOGcK47koE2OkHi83cIUFNwlhQPWUnUTsFnjk
+            Y4qNPZtp09TDqgGPqEqFfCvuf2JYSWXmTwXgcWDTbmfJJ72RXJpdZg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-07-02T12:29:39Z"
+    mac: ENC[AES256_GCM,data:4uthXeFJm7aucUPlVOC9aUJ4R9efNMz83PDMDcJcW/qYO5FmX9MAFg7f2koos84e/QQcEUvozfYiLDKNTFBFAaGCfSkwu5X3MRVqhgsNufOvSSxJn1o18NX9GMjCFt5PRNlsshrh0xUrfryQ/LvKdkNrWT40sH4E/shn4j/WMjk=,iv:r+EPqNWjTOlPX2QBSi8RcUz4GI6yFHl9QTzZuVPDSEQ=,tag:kPKYM5GE8NP4TUBkqmygjg==,type:str]
+    pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1
diff --git a/secrets/vf2.yaml b/secrets/vf2.yaml
index 6cb80827..fca47d73 100644
--- a/secrets/vf2.yaml
+++ b/secrets/vf2.yaml
@@ -1,51 +1,35 @@
-network:
-    wireguard:
-        privkey: ENC[AES256_GCM,data:vUljbKgXP1jCRF1Vi2JJkYTAnHmo7GmolCnMyrq0X4zO7SpG7Te4azHLUbU=,iv:xQ7mX+xHnk353v94x2hDvjxfS5fsuSkl69cXvXiPmIk=,tag:5w//7vHHqRXMy/z7tliQzg==,type:str]
-security:
-    acme:
-        dns: ENC[AES256_GCM,data:N0YXP0HvjrJBaI5xknp2WGM5Bm+6Sm9jI0ZGO2QgrG2TcEC8SLA4EvUb1FrrKZTLQt4/WRK5/BDwaeGiNM7T/c3joVRVsg8aay3OjEDRv4ouuen1S0+jk7W1OgipMnRn4qDVoTG7BIm+x8dTI9GU0PxsLMZp8gVpdmyqtwoTO1FkqH9nCzDz9cWrgLAhPZI0P6zwLCAqehRGw0OTdgpYeuaP8X3lULuxPT7dgs+Kal35DdztkGHkear/EkyRQ8lGASqObdIAG4WK5DGhYErYU4+ACmPt,iv:Ye1mFPrOff+86NF32plcscrIr54PlaptoQ/l6R/WUgA=,tag:0aMJl50HX4DvOB8tYBbYBg==,type:str]
-        cloudflare: ENC[AES256_GCM,data:AF6Bi2iKf7+rBPl6JSXbTyRHHSaiIDlN0zqDzpy2ydIQk1aX1sbo7DHZoyBvXCP49S9ayiGQd1yjAMrIK8RxXfvyOjCgs47mWfr5x2COmoVsUsizc7EDD7kJgo3zBpUCkdjjgPFR1k34mOn9GehwPUtR4W7ltzdUu1Ncy8PKkV5e92NUILDCPaiTR3l3Nr4OPwWrqBhs8jdZPNSXTnXhDlbXQjPgQoWOXdgYGi9zlxBMoIgo6q5xSc8=,iv:mg3iMyTVnGmzFeMSDq1pAxtL5WU7gtvv/MNlmSiU7Ng=,tag:VwGjDLGijsHaiA/5paWFFQ==,type:str]
-        gcloud.json: ENC[AES256_GCM,data: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,iv:2lc0KFAf55VSqCLLAFELp1eIY4iJ8hMZdpH/Lw7DIW4=,tag:DVas3hmN9ay/qjHzMdQhvw==,type:str]
-        gcloud: ENC[AES256_GCM,data:JE43qbN6WI2bm0C83yhAfB21outjn1fkGQHFVHiSjwmykZlKowD1v+sDmGoSVhF6rd9hheLdyD062Pjes+x8DQ==,iv:qct/0HR9SM/b6URA7RMKiBoPTINQed0vm5P9mnRedPs=,tag:ChIPulLzmZxLsrdWS6ukAw==,type:str]
-    restic:
-        password: ENC[AES256_GCM,data:qsMILczHe/SImQrZ2jPlU0XHXRA=,iv:AVDPKAlWxnLR6gBdpbu8tUh0bg7azVQ/ngu8xa+wCz0=,tag:pRPQk1DuEDriyRoUz5w5Ow==,type:str]
 email:
-    lotte@chir.rs: ENC[AES256_GCM,data:pW0CvaQstxHPJTn0YPAQVGtf3g==,iv:BckTfCL+oYFGGqYbafDEmuVRl0/OEjt2oS7QPzhEGkQ=,tag:6X//s6QDqtsiUVIz1sXDlw==,type:str]
-    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:Ho+mNtG2UHJdJZhRzSzQDXkKoA1tb8XeIihTtjx4fQJ2u7mulUSF84ey7g2Lpee2cNl33OfjIhFNv3E8BqHxqQ==,iv:MfYQXNw6xYpzTnftfTwjWKdLSFzuycJ+aalQ+eREQxk=,tag:hzIZXLwMQtDov5DIYH+w1g==,type:str]
-root:
-    .ssh:
-        id_ed25519: ENC[AES256_GCM,data:umYy0s+b2pcGhLSYj7+TjNGTtLfcOoehD8Tc1XQLKwKtfzsJoebSdB/mcrM4Xz+f1sK6yg6qVV2BbXb30H0x0y67iEN0kSOVRAP/VUjocK44QG6d2qCf8ZZxVJGCwiJLdDKoPnUC1906geYm66wcd6DO/6I30d6c+Lw9K6+MHcKrmgA8jl3xe3v1FvbiZFA8NKen861iafolJjnGChYyQmAoAotg15f/f16ifF8KhnlmOOyakpYhhNfe/RZOu/h5fST1824C0iJxJv4yDJ3OxFYxUC24nlpdY1hbvKYVlt+/i39RQbxmg6gc/CO7mmsu3jEKWjOn4WoB8dfUMeIK7K8fz5WYNj1gkAnqp2WqKgy4gGACxy5U1NfpYw+Xnmj1q4BTgHGV4e+6xHkcqyDd5tALxOZGj6nPJ5ccnd0yxj9qIzARI3sIaVJ7yud8qboYQk5uDQyOFL5tQEftVfZIeh/2DXSOGkJKCf6xGQ/Hp/6bgIOM8js/RrtO4i7oW0YAFbghiT+bIYReSxGkM+1rl8CfwDxZVELgIXCT,iv:s60IPG8S23sP4c8uRkoqeqIQbKb/4LzCWtLzZhmiC9I=,tag:bNY/qmubYiukZWYiIq3mKA==,type:str]
+    lotte@chir.rs: ENC[AES256_GCM,data:jWobs2R/SHBOrv31uw9PpDujxQ==,iv:sBrd1V0o3J4J0FbhSTB4A+MTMFG3tPAYhjwOC8FLeLA=,tag:jpxgLAXgr93azDsV3Nlruw==,type:str]
+    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:H1bgLSnDYjiDWWCThKlN0ZKa9ut2V4qBMBnxSuKGUWYLTvf4z0evTuKyzwHcEX+fuJb6wpIvLCYtrCyFvZR5Dg==,iv:lAdASXv44/RfmIA0091Y84pkWBbl/3R5yFtXX1je5Xo=,tag:m8j6oVwi5lT4dTCqUrrnLQ==,type:str]
 password:
-    root: ENC[AES256_GCM,data:/Tt2pt4WUsjOI3dopNud8o/1HWozufieEB9Ny0xwN1n1grNtgS0+UdslEgbg3nlZemVotJ1+JPJ8yz9PSDVrvqCT9uNZI07A8XEDNhhetpZZS0hmcYFCIn08C3eP0q35+OiSXrt9ac9Skw==,iv:nVZ0A/jzMG13tUyYGE8421hWdyF5vG6FOnFRbnlJilI=,tag:NLOspi7d+TYJAK0KqFYR8g==,type:str]
-    darkkirb: ENC[AES256_GCM,data:WO9wXQ3N14NZISVecrdxTp4PPSsgxyeus0gQHb2eVATPzgvbEO6Btu7KV52y1lBe2w5fMrEBntmUQRtSXpIV3YPl0gbO8OJXq30wOyilG/jb5aeOKSzuYjtAbtmBc92TImTmEEAWNGvmog==,iv:REJiZl/ebqy8FosjhGox2mewSgOH8rWP33Tawl/N0IY=,tag:LuRD7BFtZ4Tb+s6XWIkEQg==,type:str]
+    root: ENC[AES256_GCM,data:X+nbtXzxgs4d6EvJnx32MJGFaiSbr39Nu7lS5p2duwqCMqviSMeGkfag6YIT+13ZDZPdQ1xoFEUPou9MWz2SLXztoUEKoEfnLoY/ysske7c+BKdjts+XmHwyum/EXk6D26utkLosOkrcHw==,iv:MZFv+boy5CwfaYOVL7BIJplMyeV1TtGlJ98DMuMaqL4=,tag:ZQBHX/RVkGALSRdwwQa12w==,type:str]
+    darkkirb: ENC[AES256_GCM,data:73zvBfMv+v5dMBK0zrBhkTrdVyhoePdzHBbMVTo8AWZO6V9mnKuSmItJW6wmOi8+OZsVqujzLB4h1ozhsGG1E2lnQ0IJIWTXsOJduThSpT14wm3xAF8rKCnHCLLv9iSqFSYpkVCODtK6aA==,iv:yeLUnYSPCSzy6wtX/JqDnErmZxBvBy1/IBbmYJlQ6kU=,tag:Jcg2i1DgmA+ZiZtmYY2oOQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age:
-        - recipient: age1gtezxkkfhpkv788x9dek6s6s342n9tkl40zvsa48m9a7yqn25fnsmd3wy0
+        - recipient: age1emv3kzvwgl36hgllrv7rlekqy3y3c6eztadl3lv09ks3z9vv6vdqw06yqa
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1S0llczFrQzE2SklEd3Ry
-            emljOVlUOWhMNzFaT2IvVE5Rbm1JT0V1dTJFCk5BR3RJNXpsRElqbUlNWkc3Zzhr
-            Yy92YldOeVdHeVhMbHNPQlRGY05BUzQKLS0tIGg3TmtmRlhueHhvaWdjWExHc1FM
-            MlpIdk1QaUR1QmVGY2hIMlExNm9XYkEKHm7kABlaz+IS7sKoXJJbfprIAPzVcTOv
-            6a8mtUkZUallsR9TyfUea7cLSrBkHxt4AuWhr+Ts97QFUCJ6cDJ+YQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwQTEwWGdtRWV1em54NmRp
+            eWhxdnlUU2dyQ1RtVHg1eDBmQWdheFVWdFJrCmVvVFBQbWhLZlQ0VHVzcWxBYS9F
+            NW12ZENTZDVpbE9vK2tJcnFXTDFXRTAKLS0tIG9RbUJtY3V4VHVXZ2Y2eHFCMGlP
+            RDB5eFMrTEVCajRKZzBvUW9QTlNMRm8Ka1oD6nlKG3xEbilN5BFqsIAne7AOLMSh
+            RRiZavoergIKKisnM0eUv6QFZA+pF2J3vExceqLdbiWj4wJ15WQb/w==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-12-31T09:44:14Z"
-    mac: ENC[AES256_GCM,data:KPZuQ4+jzyzZoFSU0Vt5uRTd5cgrJ4AKYrYASU6QSi4l2Bh/U+0y9lEvfOSa0my0xS5/zoSLgd0yYiObUJtP05toajC9707SVkN7R+WosH2Po68YY8epxhPleLahterOflUQBfcyyj9Sra21FlRwGG23nWwDVdzp40M/jOWJSYE=,iv:E5UyLLQ8nsmrY0Ec30in8GM+mDKTCXFfs6xxcW6XMB8=,tag:m/SHtlTp9KNJ8xm2rrVdbA==,type:str]
-    pgp:
-        - created_at: "2023-03-02T08:18:35Z"
+        - recipient: age1tltjgexkp5fz3rum4j0k66ty5q4u8ptvkgkepumd20zal24g2qfs5xgw76
           enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdA1pS5cQltPTfkcKiv5KNEIGlyH53KgkYhbe0nFLaCpy8w
-            xUoxNNxngzfXpGy6gzy6b0a6ajQbHE2EFx1r82CrydTgziGvbb1LxuFP+DS4/Fjq
-            0lwBTshuv4MeknQxEBJWlk8/JlH0P7+cdzjOIP9krxVnj1zvm5Si/thcX6PvXBLi
-            /2EAAAfMaQNEyPJI0V8LaNKyNrSKfThWMYzlah0rV9GnRfGuM5YQW8jUL32Q3A==
-            =rf5T
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Nkl3c3RlaDlDOWRXVSt3
+            REZuUmhVMS8rdXl3RmZsd3l4eC9Fa25Ba21jCmNRV1U2eDcvc3A3aW5KVmtBV0JQ
+            V3hxc0luSVV3aVBSVEpQWmhQL0g3NnMKLS0tIC9maGdTSkMrYVpVTkdCTDRqL2tz
+            N2RGNnRGZjFCRkZqcEhqSnhvaTdlYjAKyrcRs5y2k1QvUzhF2EpiNBBeBxLWOzlP
+            Z+lRmfe8p58vB+czvQFdIS1nuWRNDOZnqH85eZ3OioCPgTtlXuGyvA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-07-02T12:30:03Z"
+    mac: ENC[AES256_GCM,data:YBa9HN5UNU2zicEspEsIMAR1TqN46fI4esUptu9mRBOFN8Pnzif0HEJhW3ZZX7PvVCxhnfbte4zpbhYx15TKhdk6NzlgySLWf6SDadzsu2VQVBdkkZ5K6RI3+9+x6DftEvsIgQk4UXVjLVNSLa9GFhoA/oJovhX35qZ0hpdTHQM=,iv:fp4SZ+Ds+92OkxrrthJDWEu0Sc+sCWNBv3ERzV2Ajjc=,tag:4LpXCBvTOSeau37yjeRxuA==,type:str]
+    pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1