Add mommes GPG key to sops

2023-07-23 16:01:04 +02:00 · 2023-07-23 16:01:04 +02:00 · b5ca65d9a0
commit b5ca65d9a0
parent 6af66d37b0
5 changed files with 134 additions and 92 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -3,6 +3,7 @@ keys:
  # TODO: Add @ruru (I was not able to find a current gpg key @e1mo)
  - &e1mo 0x6D617FD0A85BAADA
  - &adb B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7
+  - &momme 5D22C6EC4A6E52469819B56D5EBCCEF2F33F7661

  # Servers
  - &shirley age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe
@ -10,17 +11,17 @@ keys:
 creation_rules:
  - path_regex: secrets\/all\/*
    key_groups:
-      - pgp: [ *e1mo, *adb ]
+      - pgp: [ *e1mo, *adb, *momme ]
        age:
        - *shirley
        - *goldberg
  - path_regex: secrets\/shirley\/*
    key_groups:
-      - pgp: [ *e1mo, *adb ]
+      - pgp: [ *e1mo, *adb, *momme ]
        age:
        - *shirley
  - path_regex: secrets\/goldberg\/*
    key_groups:
-      - pgp: [ *e1mo, *adb ]
+      - pgp: [ *e1mo, *adb, *momme ]
        age:
        - *goldberg
--- a/secrets/all/monitoring.htpasswd
+++ b/secrets/all/monitoring.htpasswd
@ -8,25 +8,30 @@
 		"age": [
 			{
 				"recipient": "age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4a2lEWDRYWnZxczRhRVhC\nTlp3UW5GTkk5MWZBa3c5NC9VblIzOTc5b2dVCjlkcFIxNTh5aStRaFo1dEZkQS85\nWWovUDNWZ2c4ZHFEVkVHbkNGeFhJbkEKLS0tIG02Q0lobDNNb1VKTGJXRVQ5TGps\na21LeDcvLzdCajlxaGVSUFBqeno3b2cK9JQJavmLnMRvYd2u57/IIVv8G7xYkn4h\n9PUWU5MD7kEwlBXFs/4iBiqADk4UREsbrY+/9NF4VVju7J2I6lUJSQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMVEVGakFtUTFJZDlJZUFS\nd1ZOcFRLWlNaRFN0ZkJhVnZYcmNlZ3NtUGhBCit2OXZmMUJTNjNEaytYWFFuY2dM\nRmNjZkk0eEo1ckYxTnd1T09rZ3AwOFEKLS0tIEd1T1dqc1BNN3VSNHVDVHQ3MjBK\nY21GMTVWZmhtZlZWNThNb1F3a0hwZjAKPG5aXm+w9HVhYfK8rXd+X1+LRb3eY7pm\ncGC7OI6DGyN+qlCsnCoSLmNyT2pt+hWTuNB/kGbtd10yMdAyoiJphw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1w3wqxt5t00hjv43dcxlr5rjec5mvuzz9ajc8k04azq0gfx0ncgysu6mdmm",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxWkw1RUR6OEM5ZFY0SnVS\nR0JxT0hpdGJYc2pZSmczWnlmSWRibjF2dVJnCmhIZ2ZLV0JLQXp5enJZaGVUaEVT\nRTlKWDZ1Q0F6ajAyVUl3amRRWDZGWVUKLS0tIEhXZHQzN1VoQ0ZwWkhvOHU2OWtI\nY0xCVmtZYVpTTElySlJxd0RxQk1aekkK8Lr1DXs/Faoe0wr2nLu4uIz+XAocRp6V\nCXI2DjjyYLf6BqUTTwDz2aRswVt2rgGiBhKeAfMx3dR6WgoNa7wiAw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJQ0ZuTS9uQzVjMTRYTXRU\nNVJacHNiZC9NcnVRVGRKSWZqek03ZVdaeENJCm9FM1VHSEZvL1VaOHNuSTQxVWpm\nc0Q5emNnTlB0T054eCt3aVZ0enBZc2MKLS0tIFpYSlV4TGtLNHpHRU9Za2hXNWpP\neDdTZ25IdDJ1L1NuRkNnVnBqak9zSWMKsRhjouzE6VhA2iQfqVYBztuK/CmSMDJp\nV5vJ3ry+apWUnlSA/3Q2QFEB1O4vfdESZgtIyWjInRS6YThyuA1mcg==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2023-01-03T15:04:58Z",
 		"mac": "ENC[AES256_GCM,data:4PTqDajceBpa2P/FCojNHIKbIDWpktIfID8x+M6cCCDm78yUcORnQhayQh6jnqx8BICD2tEtLZnaK/dkSgP15rlzPVeigkbLK7mcscJCPQKiVkAz7NghUvHK2humyd2ERsHd+vE8+lJ9TnLWap+nVamc0kTdWqgxJtm4w7MPP6s=,iv:PyfROMfOTP74hVlsVZIARe+0rlnFVyNEn4cmT1+Do44=,tag:MvUuLXDV5DkoY50FC5ELEg==,type:str]",
 		"pgp": [
 			{
-				"created_at": "2023-07-17T10:19:50Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DOnsoj685gdcSAQdAyImmpPsuK0Ps5YP5wbt3X1UVafLt+UkzEe5+oLLl9kgw\nc9DFy2tRaiMP2308ZGBgeIDpXRdqbAbaLIM4T4lU/dbJLUyFxx1PI4UHYXGaFhVn\n0l4BoLrTLQObm5reCksYXaX1RowjjpWHJf3cPq+MCAKB51FiFWQjmgUN5voyvDVg\nYdx1DmrLiucFGkbt+MIzZJoA1lozSTHId3htPljoBAFR+P28tJQs5qJ/UvWfhdcy\n=mwHD\n-----END PGP MESSAGE-----\n",
+				"created_at": "2023-07-23T13:59:13Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DOnsoj685gdcSAQdARLymtHKsgOkxOoEIEJtG0lw/5r9CSIO7cvtvLUUoLAcw\na0hTsP+NNd6XFDOsu4W6jhQO8oJU2pVVffo8gorZD5aIPfvSd3Mu97uvpcg1OyS3\n0l4BpgRKt8wDDiO45UeWgeGF3DDHKFWm1itMR/zbyGSxw+C3le7QHSG6bqA8MKWx\nB+Y/t9hKC4GMqjXuNtT9/1GZR29JAw6T6fNUpoN15yq48TY0V/DvmCKmVVwqjLls\n=sH8y\n-----END PGP MESSAGE-----\n",
 				"fp": "0x6D617FD0A85BAADA"
 			},
 			{
-				"created_at": "2023-07-17T10:19:50Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMAxFMPvz46t7rAQ/+M7E+ZMnvHj2xPOvyy6v5rPHPUBCAvS6EFGN+ryjGDSFb\nt9/F9VNFWJD+ak/JtxY6ECYTP8d142JqeHeRLkOKq/CfysPbGCzbfAKUFEplTJ70\nIH4qfP5nIrk8XAOKFDKXQxRbyvQoYo4SlaDu7CigN5NHthcss7J60y8/aqrB7qGs\nac+mLTW+VSMauL14HpFWawxo0FaysY8m8UK7xzTbwd9cJFiY7mqIsnraouG2KkVy\n41hTqmKrdvPsApoMIF2MAYvvkFu0mpjxFaei2kfEh715ylKM9HW44EZl+++4vb7x\nroqetfN+aLaCSmj8fhtnMYCuSQO4vwwDJqSn1NyZsu9Db92S/didG9UtL4r/ElUJ\n1y2Cz83BkW7ucqEsAwNrLvXNYml84OHjdSjfovPKfPXrDQAilsq5n83rIwK12Efj\nNIEfrSHYso7jt5JR+lc0/jEiV0uI57IAzkQC2jxs6Jg4htN0uuIIIF8JdxEjOdI8\nxfBbEis6wE3YEjxpLmA2tG9TPjeNbMAB05MNBf6At9h0//vvqyfrnxT5sJvbIo3b\n3r51MfSr39TvhWqTh+WdKPocY6NQnYvLlDHijC2WzZSLHZaTJEp/iLknr76n58J3\nZOJG4oFwU+uzp5sGgefg4wk0ZouBIoFjT/eBbF1TyW6dsMLYXCfjU//w+dYmPY7S\nXgEFP50wSDd1IzarXp+nZcu21vDvbmVP/n8Eo8LOBjyq2CGJRiTV5rrkoIGZtvBJ\n1oKMgsKqiXSkU+nzb9/hdk5/PFc0g7tzeTwP0nnZL/z7s+n5gUZD7hH/CCbQUF4=\n=kjJT\n-----END PGP MESSAGE-----\n",
+				"created_at": "2023-07-23T13:59:13Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMAxFMPvz46t7rARAAuDpoJqxjfpalEy+xQ0aPi9eH/FxbksbI9DUnOLsqRvSo\nk2n9r74gboLLuEXts+Dx0F9iggk8gQWuxpMHU5Doamyj+NIKa/yuM4CuJBxEHy1O\nBHRR2JdS0U0BlCspVxFwJUP18FMGZ4M50/InWffPHT3ydBalUx38zioAM7YCGVjE\n2ZJzYFgsiwWHTq3uVr5u1cY/TMWO8d7wBUMAVQI60ud2Zix+ouqiFHsD8YsXUAnp\nDP9m6eNOJ90feEf4d3HNQY94WKe+PjZHPJUdd22mKNuLTCiLPjEokMgbNU8XcZOg\n5wGdyl9VnlZlilT3r5zotsiVM+HDQk44yHRKAAVKpxFsEcgM5YXLCb95rmrRDb+v\nTwbDrlXmFyfn8u5//trJz64hojFUAKJvP+W7PtOJPCEGtw6Q3Z1PML1VmpCOIFit\nKO4yepaXYdnmWSX8i6TTl9hSMHUGhqQHpE2XiS319FdW+lx3POFeCPCU+IhpBE9c\ng+9OVgn5cXmhAwr68eDx4XDaYk0eOI/Ex8C7rzo+heovC6jxItHFuVXF0Ao64rsz\nZ0mydgcEhq0g79AH79tgF5Td/n/DHSiTjoR/QHnCeWAmUlyalq9TSOt2wjCpGbi8\ngTwP6i8H99wDqR7T6o1w5RXpf1JzMj6nbNVpQxhJipprCf04jTE72VUlKmDxtqLS\nXgElJYKILdSoXNXMsdWd8Mx9NYJ8zn9OPhaNyV83NjO+QpcZJqG4AUH46+Uwpf8Q\n63nUGPflUPokobjkkhGSH0OJBNi4r3kGcJmcnPhyRktnUd1aohZLA9fXEQvXbXo=\n=vx6l\n-----END PGP MESSAGE-----\n",
 				"fp": "B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7"
+			},
+			{
+				"created_at": "2023-07-23T13:59:13Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DyBlv2iMmB8kSAQdA5E8oOQfOMLHMEwtyAy+cWn3HtEvxRe3m5uWSd8BWkX4w\ngqNf2tcdDtMGQ6FR3ufs1Dk2xYcEKZmyey3NH3DGiSVeQ6KYfPyL+eCuGbsiIehs\n1GgBCQIQ1Rvy2pOH6s78ARAHZpV9b8sl2ShZ5ANcy1wD0Irq8sbtTRDLDLjK4OnU\nVERwU0WXSwZ0lPzdtM046uLvMoyHQWqrj3LzOX0Gf1vs6CZoT39xTQeZrWFwlWgK\n2FpxpcA8qiVPOw==\n=p9OO\n-----END PGP MESSAGE-----\n",
+				"fp": "5D22C6EC4A6E52469819B56D5EBCCEF2F33F7661"
 			}
 		],
 		"unencrypted_suffix": "_unencrypted",
--- a/secrets/all/secrets.yaml
+++ b/secrets/all/secrets.yaml
@ -17,54 +17,66 @@ sops:
        - recipient: age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmeFNERmYvKzdsbjdjTVB0
-            ZTU1NDg5RmptcXVrYkVXSXFIU2d0RUhwU2x3ClI3UU1hamlnUTlSdnZkRlBwSTZR
-            QW1veURTS3BvUk5JZGFHZnMvL3c2ckkKLS0tIDdCZHFKNWI0RzVJMjlCQXNLYStq
-            Z0k1Q216c3JHWXhNdzFvZmV2ZXJrN0UKVUgALg1Ye+D7CP7t6EfPdq3mGEarjl1T
-            h9UPsveGkstceVhE6rFcm3uNne46TsHFu9lhMbN5w5OErrtaMOTu4g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0WXRwU29xd1J5a0JmUzBI
+            TVJnY0FlaUthcnQvQzZOa1pzdjVTT0YwckZJCmpnUm16RHQvSXUzbkpIUkM1cUlw
+            SlFhL29QMEwwc1J0NXY1Vm1MTEd1bUkKLS0tIGdwRW40dHA3c3YwOHhEb01DWHg4
+            aHRDR0drV1Btc3FFTHhZQ0YrTSs5Y28K1IjX1yEpcwxqf5Uni3jVxUdFv231cMCf
+            ETT4jTpOv2uI3kc+cPzYGkBM7bfdrGvPa2n3WU63/UBd6WV6+nLvOw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1w3wqxt5t00hjv43dcxlr5rjec5mvuzz9ajc8k04azq0gfx0ncgysu6mdmm
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrMU50emo4MThtVGU0YnVG
-            SXBYZkpQMTF4akVvTVZmM2lNZDZkTzhlTFFRClR3RU43N3NpQWhsZUF1L3VZazFX
-            Wm9PUzBKZllLUlRVcVRZbUJtVHUzaWMKLS0tIDVwaUxKTkxPRXlnRVZ4dHcxRWdX
-            d05iN3hkbUhWWlJESTR4SmxaNThUc3MKuos70rjqaVM+7EjE1q07RilllQG80qXx
-            oSczai+qj+DoFTwWrN6Ks81Qypxh00gKcW3wJMGRCiTkOGZjUolLuA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhVkdXWk5pd1BpY3RMQTdI
+            NDNpRlpvSTBlT2JScWlSejlLRHVrL1FlRGljClJoTkZuZ3NGZ3FrT3RFS1ZlVmtL
+            Q1pUeGEwVDRHK0E0NXk4aUtva1NkdlkKLS0tIDFybnI3UVhuSlVReWQyMUR5UFdI
+            Yk5teWVQLzcrZ2lWUDhvd3NwUHJFRVEKcjgLH8QLHLcxBj0r3nHRvEialIRjXaKI
+            ZePtFPzNq1JUz3SrkrDddxf0Cz94J2gtYF6NZzHLtet4A9nQHhQSdQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2023-01-06T15:51:57Z"
    mac: ENC[AES256_GCM,data:PPS3MV1tZJMtb1ITMhXTnseIBonpanjISFiUAV46LesJLDH7ag8UM8Vwgdrl5WOI3SIZcTiwvYGjRctLx69kWnbEJPFzg22EZSzvQJAIzdxHe1aac6th++5z2hPCFUp04/CYrB5zqIirku/pw7gLGzOlwVCvUJEvLf0V0mjn93A=,iv:v4RHMFHY/sADWv324thv8ZVTX41I3faRtXIyaB7QVWo=,tag:VXduStNDEPkFGPa9RyKSrw==,type:str]
    pgp:
-        - created_at: "2023-07-17T10:19:51Z"
+        - created_at: "2023-07-23T13:59:18Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DOnsoj685gdcSAQdAALRXm09iUZtXxvNPyD02al5soZKSqBqZdCAonPeaaD0w
-            QNH8lXF4OqLyam+ZcUweIPqwMMjib6FlOEwjAbw2hBcBKyERmipzzCBJNy3khtkJ
-            0l4B+9UDC9nTReTBYzZaSI/CMLp9p6BGZyBnUUqS/v9JEaKWeqgy24QvnbOiXc6h
-            JJ3+u1i8bOZkKloi4UyebVVdxzpElw46TEZ/00gKOT1F/H8HjeI6qob/xo7/5WV0
-            =Rwmu
+            hF4DOnsoj685gdcSAQdAr706ABevscJ67BK79KrUZQgI/GbBf4RdWgbloZAWkzow
+            A7CRZG2MXkc3iWe8tuQoxgB5c0BC8Hna06Vrz5m5WSmGRDBuYv00eFqLOSP+/WYR
+            0l4BvJQmFUMpx4N9UBf7iXq41ck/eYcPeaOgKvrQQ1keZzJJRkgy+7iBn3zm95Jz
+            6KlPu7ivWCrLF6pMRDS/a6lYopuQsL+1ErldkybekI63cEu7o6iQqs9qZ7pYvrWK
+            =sa7r
            -----END PGP MESSAGE-----
          fp: "0x6D617FD0A85BAADA"
-        - created_at: "2023-07-17T10:19:51Z"
+        - created_at: "2023-07-23T13:59:18Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hQIMAxFMPvz46t7rAQ//XB5DdohFp5DpU75fgua0/PBFNsTKWBL5u3JaxyjZ57+E
-            dAPbQ2u9UpNC7O+2oFrOzHJ1smXCLCmd5qiuCrtSaJzQOyo1rp+AdNS0tdLf3224
-            m0HTM+gZIJDf03BHb3TD9YLHxd/ISYyVOiO6GtUmnJeJD67LR/SjaOr/NJFvBmY6
-            fb6u9FPuX7N/6tgwOayMQ/4uUaP6PuNushDi1nx/qotSRP1hE++l4/Se4OwUMbVG
-            B0HuHOeFmwO14TuMhFAroaiSJtadjKd60FBM+2pMxvawZ0q0UPhUSoaJoJUOamV2
-            8uIbYKvEo9tdvcYA0oLfdah1lCOLC3N2c8QiDhXklRoeWe8Eq78UmYi0vZiz5p6/
-            aFZmMUxoXujeM1m2ci+iKOv2kJ3wp2zO66TIygAhmFD4vEk8RboIdjjbPenMBoSZ
-            tdg27pHhxi8qymFfCtxGnLkQ20VTwWrT5E1d7rwhMoCkJZBshYb7OALbBjVchZ+F
-            WtNJh4h0RvWbwx+8uhFWRaGsyZHBiRBnpG8eEtsSC76LpusxU6z9/u2zyQRxLkjm
-            iwoVcOGTNkblaa6AS89iKxc6JgmLiQMcbFgo4GFxHkYnzIJ9WpYHt4wyvo0VIWJs
-            O+mLNhLdwdLI1PLtELXYAQc3cIbOoGh2qax1Xw1Mp533z4OqarZuRL4KYD7wKy/S
-            XgE6YFvbDma2VxLAXX9DTYlHw5i4L8GFYjCcD1YomtU8b5wTGy+VT8+YWZv+djiI
-            aXHdYJWbqZsZWqr38eNAsiwjxd1dnfcCpKjxKL5o6AYiolZXUAMH9XsvVALKktE=
-            =ls95
+            hQIMAxFMPvz46t7rAQ//VE5vdpySwskxvQGLiI9JBSlMVQwYp4mh8nHH9p9QwM6d
+            EmF68ersf9PCKQKXEg4lpuH5XwcP9lAdsbe1LGgGGy9d3fnW0kYAVB569PaQdaZy
+            g4dFgx/fapGDBqLT0aErdT1ngyYFE5A1BsSQyIerfrHwcs0GJy4BU7GjjfBqS5Ec
+            YahKTc8m8sTnTZgsgXkDnsfUC/VdqTA/A0XuPwMzxY9u/wCjeH4upIBE8O0dbXZ2
+            mFx3k5U9Q+Ljlzay/UVDl65E7K4/086HNff5bwse/kQyh+z8+2ggYL1sdTp3PrYp
+            4ylKOO/4qlZ/fJfyJEVoU0yXi8CnhB0qN4HLBUrvfaMYJDnYpqO+R3ZbSpu3pyjV
+            gTlgRERLkN0IZn3DXBG5Xyescc0Rr4KK01fcj8eBhNhctgHgE8XF2Kc/0l3xaVV+
+            NDIO5/wJ5GmtrkdlC2NLFWh98j6VVfceT+ghsrZKD0GWCwiVK9L32Mh6djCObfGW
+            bR/NY5FaGYFRufvrfp9SRTjNab2hmOWFbKemRV3RhVRago9ElFe0R1H1lFa0WHJM
+            yWfc8z9L+F7kRInnWYeFJU1EHHDGtq5p/VkkMML/TJ62wlmII0Pe79C0ZL5xnls3
+            XONmPQrtdNKE+EG951H5xCuTlB98yo0f6C4Tf8x8PSAQxAV6U7aNB2o0q2miKrLS
+            XgEXgV/e193SWTuoSw15tzi0xM3moXHoHqTsmtfvvwSqavS4VLFvlhPu2joiMnPQ
+            dvSmYkS5JpAc3VHyqrUj3p3it/kEtBfxKLyV/lQDu0btOJNsbjTlxv4AZyoiMKc=
+            =rLMz
            -----END PGP MESSAGE-----
          fp: B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7
+        - created_at: "2023-07-23T13:59:18Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DyBlv2iMmB8kSAQdABT4P1ZLIFvQyplc+QYZ5UNcT2MQr13ZD+fwD+WBe+AMw
+            7P+EHIBVAYv+Mvj78ak8mKct03WF/XIdlWW0HHaNKPplxiOXFVJnHeDiK1vTdEHZ
+            1GgBCQIQuLWLrlq9CgLWPIBiRvtDsxbV+0A5D+eHKCwolzAkQu9JHW55zN4GskAJ
+            qRv+OQUvr2bUV3T520189mqvkfQCcFSgjNMQtZ/9w2qQDpQz++KaJvSIFyMSLz1N
+            9o9ugx6obvyOFQ==
+            =MiWH
+            -----END PGP MESSAGE-----
+          fp: 5D22C6EC4A6E52469819B56D5EBCCEF2F33F7661
    unencrypted_suffix: _unencrypted
    version: 3.7.3
--- a/secrets/goldberg/secrets.yaml
+++ b/secrets/goldberg/secrets.yaml
@ -18,45 +18,57 @@ sops:
        - recipient: age1w3wqxt5t00hjv43dcxlr5rjec5mvuzz9ajc8k04azq0gfx0ncgysu6mdmm
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5MXhXalBKSDNvVFhBdVFa
-            bjgwQnI5bHNuRnkzYU9kRGZmaGFwaFk3elM0CkJWTXBVSjhkWi9VeTdJY1ZaZVRq
-            NWc1NzJkclFsL3lNdzIzNExmU3RJeEkKLS0tIEkybGZlSVdQNmduaHVVRkhhUndP
-            ZDV2NHo3Q21OWFRWVi83R3lNUzJ3bTAKocKimmoad6wid0/GVwu5l9UQ5dqnPB3P
-            DBReCwo4Rw57L0hf5h3Yw0HSwDHGREvHeGKdBMehd2DIEFA4OkWXDA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhMVFVYkE4cUp4RXREQ0th
+            RU10RG5LNndMeGdiZ3ZYYmtUamN6Ny8vTFE0Ck5PVTIreEdQMVZlWjRSVk1mcVI1
+            eGNDTVQvRFltdmlFOFhYZWQ0N2FlN0kKLS0tIGRKT3k4cDBYNDJwWTlEUHc3NUxD
+            Y2hpYkVUYzQ3WWtyMC9VdEUvUEcxemsKIx8defzDLk9GWFnq0h1BVDL9cywblyaB
+            OA3hlNMzYZPLeE9z2fifCfPWc2Kq/WfEVggCcB6ZNnXtzFkfh5tJRQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2022-12-24T23:32:14Z"
    mac: ENC[AES256_GCM,data:H6fvAvgQCx/iXcLnId7KW5wQ/xMpW/IELg9saYOC6UBMngXNMAoneEgTtmo89Dbwvc2e1qo5fzkk7XacBTx6SNOq27gwPUyfsNKD/V+VPpJtAV+PH47CoR83pnS0uPbiyCAIJvp+bXBI9LNMBb6VrrqR7NqKva2BG528n6b3LUQ=,iv:9KyBPOKu4swk6IZCNt/xI9DKqeuwyG7z1aEXIXDxVvg=,tag:hIVSBQd/85C0+sEiCKGQ/w==,type:str]
    pgp:
-        - created_at: "2023-07-17T10:19:53Z"
+        - created_at: "2023-07-23T13:59:24Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DOnsoj685gdcSAQdAHmMntf+DL5LYv/69BFm7vv1zkcpv/D5gvo6Zs1UAp38w
-            +BGpZbkdHi8W0SgYCU6nE5we/2nCCMCp3da0ZENY6fLf1HazDp4OJ4YJkkwGrrrE
-            0l4BCXiMEPxH43f73AhGnAV84k8AcWFUzXAzGXioIQVrR8VU6vtgQSNoaHyg2JRm
-            iVBHQVg5y8g0CgAW9mAR/tTfT0Fi5Pw9KiLyEfclLEy9wd4v2s2+0U8Ul5oR2u6E
-            =a9gP
+            hF4DOnsoj685gdcSAQdA3wEmTu0YDmAy/O67Zl7Nk/FJFJmR714Jn7YS3YQr5XUw
+            lL0fDVsqYHvsgIS38iEiI0bYgNlHCoXoZIUsMXZ2tr7TOa5GQ8InrgbO/Fg359lQ
+            0lwBr2dYzGnbfcbwVKEW6trDnotD+mMct6AUs1sIhnoPJWk7kyQ5LkhGag5Y7g80
+            G4lFIsYyNU95PZfQ/YZy+Dt238zr0m+5SlKK61EkXfIhLgRm9+jUNzs23gPxgg==
+            =t4/j
            -----END PGP MESSAGE-----
          fp: "0x6D617FD0A85BAADA"
-        - created_at: "2023-07-17T10:19:53Z"
+        - created_at: "2023-07-23T13:59:24Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hQIMAxFMPvz46t7rARAAtgscGzCC47oRkdvDlRK175dDddY7LHdTBxX+Ddf5cFOs
-            Mpc39//jQqpl9pjNXTep7cPsYyBI9YCA56PZ8QgE+tlLQy+YHpTb25iXXXpxlRIQ
-            BW9rFqbJ6ScA1s/vSoy1SThsh9C/MHOwLT2kvD+h0VS3tYSz5zkgpZynQfrmkDn2
-            r9PT73RT5az1lLvqO+Z63dwxiCjB71U1+uDgkY8WGRM+wmXqJx/xyj/EFjlnVIxT
-            uDcDkTjPKkvLN62Dgry5Xoyx4KuJ3+BE6HwSFx7XRd+k58iYn69+ckUQqMASKe96
-            ZqjTycCt9u7IMArnycb+wqueCfCjSwYtnP2Yf8Kpzo5RkyTg1ogWGN39vnoHwNF+
-            DsvQZ/qtfxk2Yk/rGh5Yp4Hm5WHnw297lM44CsqIPvmIz65P6Hmy40JI/Y3qwpc3
-            aDp/4+1ajECppgZB/EGEtNh2WTweWyzvatLgvWi0SPycp3/se7h3Sg/MJrphRiR5
-            NiPSpwhFiKVAZaN/K5+wDKEDzvnJL+tnH3HzJU4HG9z01CIguKGrBGPrpm3AW9wR
-            BdQddG1RxQ+twZgjm0Fgp/ZzLMY4ckTvP07ncyKYwxMP/cujUj8HT3JrJaEUnWnC
-            a1VJjFuqTq/fi5+c14IOUSbPu/KgsdQiUz+nIzRi7NRDPBg2Xx/wsGiMka2uVPHS
-            XgHfa1PtrK7XwL/YvEMZKoeodBqhJZ0heO4By3qnYSin7nfyffI74Pdrqyr5+sOq
-            MFEOFfgs+8TwykTL4YAJx5+SRxt0+SHIDx+M6oAYGRzChq03ln6CIkyHwyDXNhM=
-            =yHFx
+            hQIMAxFMPvz46t7rAQ/7BwlwGHLIDPUFJfCWzC8eItPLKpHTSW+WEFT9vej8FkYw
+            rVSm0QqshY1p/6VFEji8MBpm4A0GYqnsvU4gaIGy2K4sg1HZfWcrjRwzr9ET1Ixc
+            wD9rz8ctAXFdTMHYGd+23TPpGgDyjCwMyWmxqxrtShQTfJSMhZzjEDmUD0Vlndlx
+            g+Tgxl7eHcGhqSSNv7vVu9K4DE3fINVP6qredFSWHBWv98qUzglyMcbN80u+F5vE
+            wY2vZ/J0D0k1H4te5T8zPAmMLl9Hb13bz83Lh13qkXPw05WhChkI5qIppzRl73Lg
+            Qtuh72+X3OErq/froVcxDoHoiRhWbSQcZwW6urI2wyvwpHYV+b2DNIQL5z5gD2Fk
+            wThkdaIM++afQUUDlw17iyynccPxuYYVjOo44awp3DMYsrbaL3iG2sw2ixiWaT3e
+            5yEh75jnm79M/tfcaa64wcvL0N9egLk6iaJVkLuyRO0lz7g2C6WpGgfoAD2eo1JG
+            7fxnGrNcJNwNWmhYWgkAfoCNM3Ot+TQaljMTdTcFeaH7ek6uZJyUH47NmJcKdGUl
+            /QoiGw29dzMEHkGfRiQ4DAhPH/BmUqZaWdYlqBf24nuNYVBEG3sCeaIEAwW4ZDHG
+            P+Rqhn6i1QPFDU6CfIkcUcUQtunDxsOqZ50/YZr/X0lF902O7CVFKZiyYJBhlfnS
+            XAGnM1Q5sD0JGhhZOekPwYrjyLEMQIAcvkDJlt90eE8BaXpiRSqo7r3SdRWiyWlo
+            6Uv68pU/pEL0HcP8uOmOYL/t3BhuRLZcXNG1+KEGLWaRW7DWHYhmqnGhRocJ
+            =8e5R
            -----END PGP MESSAGE-----
          fp: B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7
+        - created_at: "2023-07-23T13:59:24Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DyBlv2iMmB8kSAQdAcDwooNM6KawhfOBCOLPtV2jc4vegMgWk07OolU0d2kow
+            n1XjatXEmvc/4bdb9DKGmRsDed+pSphzm3krYAbe/1N1R7ZVv6lfOa/XqB4RCyxM
+            1GYBCQIQw2I0VH4azwSpbCbL9zUIxPK+g/nK5/ig2Y0d1f62cHuSiByWQK2F2bxJ
+            +0nExxHzwpWyQOz9/kTArrcrS4wnDHH61Ua0/kjCEQpO9QQSr5bfsJoPviQkr7HP
+            lvPgZ84UoUs=
+            =1s8w
+            -----END PGP MESSAGE-----
+          fp: 5D22C6EC4A6E52469819B56D5EBCCEF2F33F7661
    unencrypted_suffix: _unencrypted
    version: 3.7.3
--- a/secrets/shirley/secrets.yaml
+++ b/secrets/shirley/secrets.yaml
@ -13,45 +13,57 @@ sops:
        - recipient: age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4YURSRGtkTlgxenp5NjZu
-            MjBXdlM1MEtiZXVpSFRlYlo2eU5INHV2Z0Y4CndXZFpKU0hxaTdkLzdMMkFTQjk1
-            amhYYnZJaGkzWmlaSEppNFRQZWpKMmsKLS0tIDBDOHM4VFFFUloyamdYSmRSTVNG
-            L2hyTVR3UEk3ZFhhUSt5TkJEdmNNblkKdBc/6IgWh5aC5hf8xYD0AdQ9Bd70gAZ4
-            72EW4rTaCs2puS0D669SiZvj2a2Wo8ROB2nI7aqe7NXU8AKti27Dxg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUSXZMWFRDYkRKY3NuaW1E
+            eW51REhtNzdHSVpLWlR1ZVlsQkRXM2VjN3lFCnM2aGtHZ2xEam5mN1IrdFVaYVk0
+            ZjhpMkNOS0R2R05RMWpoTGtUNFJlK0EKLS0tIGphMHMwRkNoVnhtM1Jic2tQS252
+            TW9LNncxQy9YVi85dVlMSDhybzI0ekUKcfvXXlnOsjjDenlJOYy2IVtsnC6Cd03a
+            HU9rN6T3TIAk9kpkY7O9oqzbJCPWsuzOLa5zE3drPVFh9RGTxhcVAQ==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2022-12-30T21:13:58Z"
    mac: ENC[AES256_GCM,data:hdQd5oQUBMdbjPqVsMd5sFIJOCq7GjcRPZ4trcT+MkZhYUyTkrHIk80XpVWUugsV4CXafq503gH5BnwMZaaYWtA53k4laIkKzuChXTSJ/D0TY1mX2+WxxMjrc5wPA2iWJwTS25O9pPA4y2tqonYXAG8jHAxDiNZmtdTKepJyaB8=,iv:H73rk9mNbsd+HoxDzcE+Cx5CmqFeuw3A9oQc5yxyMik=,tag:t4w1WozItK+QlIrs5wL8Mw==,type:str]
    pgp:
-        - created_at: "2023-07-17T10:19:47Z"
+        - created_at: "2023-07-23T13:58:49Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DOnsoj685gdcSAQdARisY1LCrLOlOgLMc/sc/mBUFv5M9kmNGc8JAKPp76EEw
-            yypiFVuIiOeY+OQPwb4Elzn3BG1qJrG1aRM4SndkrQ5xJtbSXJ0YTKzNC4z0O5OC
-            0l4BNagF5kqZwhBNd5bgSlsecHgpGVOHJmNK/BAp5tJSRERYhJnHa8nmkZIsvi2a
-            WCIiMe3OygS67AcK7p3w/3See78ArrWw7/nkRAQRbqTsdMG6aFAj4N0yDTGld4Re
-            =eu7k
+            hF4DOnsoj685gdcSAQdAt9MrBCaGg0v7Ci/hYYt67qQLBQ8ove76Anuvi53kjzEw
+            yky3PXPYXCdl76ONIyWvjML5OS0KB+OREUF09Nfj2G4SD5Rk3ufIFMshkyl0zGtd
+            0l4BiTbCxUC3XvEKmNvV7HaDN1wWsHb8z9ppcBkWhLXCc6x9icI83Gb0bkyfx/qm
+            9g1ogbTCNN5eH+G4YxdzAoTm2k/+gP5jVBJVmEZ5QDot/OxDfL5uWYLxQbxHDnOY
+            =2cY5
            -----END PGP MESSAGE-----
          fp: "0x6D617FD0A85BAADA"
-        - created_at: "2023-07-17T10:19:47Z"
+        - created_at: "2023-07-23T13:58:49Z"
          enc: |
            -----BEGIN PGP MESSAGE-----

-            hQIMAxFMPvz46t7rAQ/+MBUXrao/D++ZXuhrKA9HPmchonj6cfCdsrGxl+16hedF
-            lv72LVk/72LTrY3RHxz9o1aj0J16J3UJlyuLoZUfO30BjFuBOSyV+Le/AUFcOzBQ
-            lW/8oKe9tqP/zERSTYnniu70WUqQkxJkAWWnL4Sxx7OB4Gs2R1R+lv9Ut+EGwwx7
-            PZhpkUXXhcxEqjjG1WS4ELzlpSTHqWvu0qSI7O5e+E1/2OJYx+qzZVRZN1FYi78e
-            okj4uaq2oZxxY0JICO+FihA7iM21RH4LNCRPuOtKE/t+aG70posgpk4WP+v9KvpM
-            wlEqYJezQRtTxQcmYcX1dJUWRK3PHeYT/1RzMThBsijMwW5fP+1FFX/BZZVMT+Oe
-            M0wNeI63fEEpROJooxduhyRrNrS9g41psUgW3xq7mGK2oHxnKfDiLiS7ZbngDjmV
-            A7N52Tvx2lMikO2O8H05w3GdRATodIREupTjSgXtpzejJXCpw9D+eWUKNVjC9iic
-            zF/slrEQJJki/Za0EBua+9Iwl9OsiQvEJN+EyvfN7capdsoFy7IwO+JJZIdpLZRO
-            0FvkhH4/yWaAbyxW8hohpeBRN3DwVCFNy/ZmskYXPGONRf94s36SnPSX1Wq08ddi
-            L7fJF0b0GCHD6xt5y38vWiF5L40MfvetZY+r2HcuDJnNCByjtd/WfsbOORi105HS
-            XgEzqU4VPv9hsxJNd6jcKfXwtUN1i1LsRtnX8cdfHm8XqZCQddO6EJOH/WCd0ARM
-            wwHBNX6bq7iSz41YvDviUN8oGsce1UmtAhOvZNMZiuK5zBX+mus0WW39znUJK+w=
-            =Fvkq
+            hQIMAxFMPvz46t7rARAAqnyz3uzw7zQfhX1ABD4jURLBlGxaMq7mMClnB5dIDN2k
+            h0F3ydwK4cgLKgDn8kcLsLKl72ihV2UE5YqTE0pEZ+YqbYA9hHfp0PSYaqmhTQqp
+            R1ymuZhx3ZQfdsNObUINlYrjzDLZrWRzoz0/hUaIoLWmscdvarVbMTFpNNHBAX3r
+            Gaq9pL0NyVUj5U4fvMhxvkJRoHofZLB5NDqgNgRLfsKgDwNF5I+cYYvjc6PwkLW/
+            h0B9+Y3b6zkdIArRR/Nw5roouGrpK3dYSpkzNfHOAI//+kilL5xue16Krhu4jYww
+            gqcUrsayaZum3W9l+rQOLIJQBGZCGGe1WZYFBq9Pfg9QCDHs0jdKuw8+djANuQIx
+            3JxQJWWGJuagfC82hkibPffbrTZOwtRUZetvtMOHlCQ+VokMojDVFWFlTqORqe1R
+            tb7AumdetzVIU0GQLS4yNJslvoLxGdfTV/Pt9NDX7jQXf0zFYNK63tYHkvY0aXwO
+            JRbakPlDYUTdYoJcYqvcco0uUsVQbUFnHhKp2dl4sBLDg23gpw6MAtAlB8L1Scky
+            shlNm05btiphNQpSIIldR+vZwTx3qHzQRt+L6TxXxpHBkbiaLKnBSqoSQhjQcaO7
+            2pCkFH+Pe0Mt78ZnzRxUUjqjYZKyhNBD3RMgpgAav2cmw4LsoXNu/Ae/lHFYvUjS
+            XgHFY/hzaFYeUSB4DPlDhIiJfq/ExEXQ1nY2L9ymJO00nPaVw0CYhsTwWJNjPjx/
+            UC3/Dybb0i/Zl3tZk2JTSmKRu9Pn1PGK9sMYPMVagGBAbY9iRMefBI5Qk/uEUrk=
+            =/9SI
            -----END PGP MESSAGE-----
          fp: B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7
+        - created_at: "2023-07-23T13:58:49Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hF4DyBlv2iMmB8kSAQdAFPNHo4IL4kJjfC8F262C065abXuFwI/p0bonAU6vRUYw
+            J8E+bY5wv7akC1hxBUZLhQkclHzpVZ2GGZ1dU17fPEPg2tMjuUd7/QDsO2//EOM3
+            1GgBCQIQi5df9f4XGHMZIDEJMdqorzca8/lf3HW2HN9y8pMomzoGOg99SoDc3T+B
+            6ynARVpHbr+3//loe9zCiv8xrLe6xHSChiFiGHPa91g5j5oKIsQRuuDbq9xQ0489
+            0iMJjCWJz4h4qQ==
+            =NCe9
+            -----END PGP MESSAGE-----
+          fp: 5D22C6EC4A6E52469819B56D5EBCCEF2F33F7661
    unencrypted_suffix: _unencrypted
    version: 3.7.3