From 54423170710e92f5352d1ad01466941ce186c372 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Mon, 17 Jul 2023 12:20:02 +0200 Subject: [PATCH] Remove n0emis from sops Follow up to cd026b118ce59bce695652d0ffbcf9ba895b35ea --- .sops.yaml | 9 ++-- secrets/all/monitoring.htpasswd | 17 +++----- secrets/all/secrets.yaml | 73 ++++++++++++++------------------- secrets/goldberg/secrets.yaml | 63 ++++++++++++---------------- secrets/shirley/secrets.yaml | 63 ++++++++++++---------------- 5 files changed, 93 insertions(+), 132 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 2fd0afe..d98eeb3 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,7 +2,6 @@ keys: # People # TODO: Add @ruru (I was not able to find a current gpg key @e1mo) - &e1mo 0x6D617FD0A85BAADA - - &n0emis 0xE0262A773B824745 - &adb B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7 # Servers @@ -11,17 +10,17 @@ keys: creation_rules: - path_regex: secrets\/all\/* key_groups: - - pgp: [ *e1mo, *n0emis, *adb ] + - pgp: [ *e1mo, *adb ] age: - *shirley - *goldberg - path_regex: secrets\/shirley\/* key_groups: - - pgp: [ *e1mo, *n0emis, *adb ] + - pgp: [ *e1mo, *adb ] age: - *shirley - path_regex: secrets\/goldberg\/* key_groups: - - pgp: [ *e1mo, *n0emis, *adb ] + - pgp: [ *e1mo, *adb ] age: - - *goldberg \ No newline at end of file + - *goldberg diff --git a/secrets/all/monitoring.htpasswd b/secrets/all/monitoring.htpasswd index 9cc91c2..466633d 100644 --- a/secrets/all/monitoring.htpasswd +++ b/secrets/all/monitoring.htpasswd @@ -8,29 +8,24 @@ "age": [ { "recipient": "age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJM21QS0VGNXNZV0NJSVU0\nYUxZaEpMQ0hQNkZPNFNzUjFOM3V2c1ZkaUY4CjdqY2tGaXFOL2liTlBxSitzSkx5\nQmMrTW5EYWZ3RWY0dEZ6NldVSkhBN28KLS0tIDEzamtzdEFQam5ZU3pJY1p3Lzh5\nY2wwdmpIWktWMEwyb09mVDh4Ujd2TUEKiIxFNC5fk38+GvBPIP0RygwA4uw49Uht\nfabstjYfQACI5Auc2IUL7nWPqVTT61obbogbGPfgRkOU/lnU7lhvtw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4a2lEWDRYWnZxczRhRVhC\nTlp3UW5GTkk5MWZBa3c5NC9VblIzOTc5b2dVCjlkcFIxNTh5aStRaFo1dEZkQS85\nWWovUDNWZ2c4ZHFEVkVHbkNGeFhJbkEKLS0tIG02Q0lobDNNb1VKTGJXRVQ5TGps\na21LeDcvLzdCajlxaGVSUFBqeno3b2cK9JQJavmLnMRvYd2u57/IIVv8G7xYkn4h\n9PUWU5MD7kEwlBXFs/4iBiqADk4UREsbrY+/9NF4VVju7J2I6lUJSQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1w3wqxt5t00hjv43dcxlr5rjec5mvuzz9ajc8k04azq0gfx0ncgysu6mdmm", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQzUraTdVYkg3THQzSXlS\neEtqSUNBMEIvSDZQNWVhNXdBaklPenk4aFhRCkU2UDE5UWZSdEFGV0tPYmxteUlh\nd2hZNXdXYSthK3dmalNrdi9MdE9ybm8KLS0tIFRTc3g2RFR3VWtyaDJBb2UvMWU3\nVkw5QW03djdyd2tCUndNNlpWcW1iUDgKF01T2t0pqk6O7gQh9xYn+KqtLXZRr3v3\nIjhMh46UOrm5OYSDqkKKFEU6Tz6PmHii9ClcC9ejClg+5lBaavlAqg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxWkw1RUR6OEM5ZFY0SnVS\nR0JxT0hpdGJYc2pZSmczWnlmSWRibjF2dVJnCmhIZ2ZLV0JLQXp5enJZaGVUaEVT\nRTlKWDZ1Q0F6ajAyVUl3amRRWDZGWVUKLS0tIEhXZHQzN1VoQ0ZwWkhvOHU2OWtI\nY0xCVmtZYVpTTElySlJxd0RxQk1aekkK8Lr1DXs/Faoe0wr2nLu4uIz+XAocRp6V\nCXI2DjjyYLf6BqUTTwDz2aRswVt2rgGiBhKeAfMx3dR6WgoNa7wiAw==\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": "2022-12-30T14:49:56Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DOnsoj685gdcSAQdA7WmJAs7/hgq93M3SphsDJv9m/oOLhf3ftXyngoj4MVkw\n4xKE1ZCN4LErd+/enCdGLeCkzxIFL7lPc1Q1BaCJZwAZjQIhwUFtK2ORWeXK+y65\n0l4Bon20voZRVNjqiU5XuzWTNUQOStiq30qf5MdCYTfyXQI7fpwYsIWoL3T3en41\nNsIHoDYmXgfoIGDHWmkFEW7YRy04/9wUvWnX67eQIEB9WPvX0s1nUnq0t/x7BVem\n=4Zp6\n-----END PGP MESSAGE-----\n", + "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", "fp": "0x6D617FD0A85BAADA" }, { - "created_at": "2022-12-30T14:49:56Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4D6iFd6webPCUSAQdAk5UEGAJw64qu9tVkeaGGDkX4+9awdb3APedVb5EZPXIw\n46V4iFaF6U6mry2BqbPOzBZxE0AzQtmVR/H3SfPlrqJYak98lhYrRMfMjTs+7DAy\n0l4B4WIodnYaPhkhXuoq2gglCCyQ8FN3yUoDfYcIRgmmBtuwp+t3rPe4pJpDkf1t\nNyHhuKWRKtLaYc9YJMq6smpCICFFYV8RohVUmK6ucWGHJVC5wTX5+Cz/UZv+qpwB\n=tQa7\n-----END PGP MESSAGE-----\n", - "fp": "0xE0262A773B824745" - }, - { - "created_at": "2022-12-30T14:49:56Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhQIMAxFMPvz46t7rAQ/9FjFVuDmr8uuPAGozef2avvej0G8XfJsKHtuVCCUK9IuC\n+dyGQ+stw5bj5BgwepACk7eeFkt+Dr0Xqmit5Q+HrnkEdKt5l5SJXiBkqsU7PwYP\neKL7LmqTQ6KdWhzu1zcL7jdQeKGJagvgaoT1t5Os8sd8Jl4SvzLWNQdVb4RkbU6p\nnBLAHTlTlH5f8MA/nkGO/ku3zs1Hfjg4laI2rWvbqSv7YouJxU2bpZ5KdGlyNMD7\nnjY0joe0EIm/CkY8s5FcOyzu299Q23fYsMKtHDs7fP7MgD7OriKh9Q3s443B++Fg\nK70Ngz2aZNs5liWG+ce+zrSL6QE2+zVtYKb116kMfFFPlWUxZTa0UcHRWJ5mqQV7\nPgum2yMFE6XYpsqlv2k1fnsSAagU8VceddYw+BZwfFJtIXhWIubvXpa3FV3xHdtD\nqJyuA+hE8rwUM6OPiwLBQmaqkywUhNjS7kEhdxTfEvmHWWQKmqqEC/27rooK2bLX\nPWNmkm3XYZeoNXB4aJY16I+lv9cuWr4zFwNF1GFx2zg3hkLU6v8zqN4NuFxa0l50\nTfTZTGYak+whMtdIbIehbjKnZ7nuKrD3agsvGsH4vd02oCpucBjz5xEhDDuoSWFb\n3QqWiPqyfTGWAuo5Xb1S4JyXkLnt8KfXtlgfYlMfW3YmbB9LcPI3e1Hg6c7YwFzS\nXgFBDmD+OY+CFYMsewrke5324Jco+CDEm6G/VKdJg4YS8RDA3J3/CT0zel8Th63J\nOGfKr8+/ilgNqFXv5uxyW6JuIrMcsBRtmosq56lCDlxp0SaLmeVpX71r3opcUWo=\n=a73T\n-----END PGP MESSAGE-----\n", + "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", "fp": "B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7" } ], diff --git a/secrets/all/secrets.yaml b/secrets/all/secrets.yaml index 8c12b01..e744135 100644 --- a/secrets/all/secrets.yaml +++ b/secrets/all/secrets.yaml @@ -17,64 +17,53 @@ sops: - recipient: age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4QitPb1YvM3ludXhFbGxn - SGEzeWthczgyemVzc2gxT2ZLZGJBYXpFOTN3CjExaDZJdGtmWVc3MHVNanhHbVE1 - a1VqaVYyQU9NTWpoeGx0QUVZeklBRXcKLS0tIEVRTGZCL09LZlNDMk85QXZZY3ZZ - RjF4RElQOHl1S3NrRHF1T0pUMkM1Zk0KeicEl091336ULOjwovud1V9f3dVvB3EZ - J+69EOsVzxACM2dZp+1iaVKbsIiAEC2H2nPEO8sWh1b9yYSsyJQENA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmeFNERmYvKzdsbjdjTVB0 + ZTU1NDg5RmptcXVrYkVXSXFIU2d0RUhwU2x3ClI3UU1hamlnUTlSdnZkRlBwSTZR + QW1veURTS3BvUk5JZGFHZnMvL3c2ckkKLS0tIDdCZHFKNWI0RzVJMjlCQXNLYStq + Z0k1Q216c3JHWXhNdzFvZmV2ZXJrN0UKVUgALg1Ye+D7CP7t6EfPdq3mGEarjl1T + h9UPsveGkstceVhE6rFcm3uNne46TsHFu9lhMbN5w5OErrtaMOTu4g== -----END AGE ENCRYPTED FILE----- - recipient: age1w3wqxt5t00hjv43dcxlr5rjec5mvuzz9ajc8k04azq0gfx0ncgysu6mdmm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnYVRhZEQyVlBTNWxTcjkz - aFhaV3VGeG1QaGEyTTRmVHc1aHhZeCtVZ2w4Cmo0c0dqZTQ0c0d5OGxCUFFXVVdW - cEExc1pEamQ1Q08zUlJEdlZEZzF0MzAKLS0tIDUyYXVvOFZ5RXcvMzBPbUlNMlJQ - UXludFJ5UDEvN2pHMEQweWIvN0NYaFEKB7lVKrsB3eX77iKWwFAXp7LVl+fPcGOl - 8CkIBa/rkSWMe0xIetew60wIwx2ZVAv5TTDmKIZyQSTayOpbG3zcdg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrMU50emo4MThtVGU0YnVG + SXBYZkpQMTF4akVvTVZmM2lNZDZkTzhlTFFRClR3RU43N3NpQWhsZUF1L3VZazFX + Wm9PUzBKZllLUlRVcVRZbUJtVHUzaWMKLS0tIDVwaUxKTkxPRXlnRVZ4dHcxRWdX + d05iN3hkbUhWWlJESTR4SmxaNThUc3MKuos70rjqaVM+7EjE1q07RilllQG80qXx + oSczai+qj+DoFTwWrN6Ks81Qypxh00gKcW3wJMGRCiTkOGZjUolLuA== -----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: "2022-12-23T19:08:38Z" + - created_at: "2023-07-17T10:19:51Z" enc: | -----BEGIN PGP MESSAGE----- - hF4DOnsoj685gdcSAQdAdf7Ow/rx0xLILWrNFPNiwMan3YUodzl/MJCvMJ7r4jMw - Lw5TUVr0sMlzSF0bw+hlk2dB5ve5bfIMN+LlMA8zJF5Ykz77BOZrXKpXYA0Xv8lz - 0l4BbGyAh1lmQ7Gjthmpl304hpvyFjxwgUZhMXVoqPh2YS0a/k7DT0/jCpVQrsaZ - TKSfzH14AXkW6eW8CB9Ezo8ojEdcgxLtpgKz716s0upRdL6SlZa8emsFbCvUhxHG - =CuLB + hF4DOnsoj685gdcSAQdAALRXm09iUZtXxvNPyD02al5soZKSqBqZdCAonPeaaD0w + QNH8lXF4OqLyam+ZcUweIPqwMMjib6FlOEwjAbw2hBcBKyERmipzzCBJNy3khtkJ + 0l4B+9UDC9nTReTBYzZaSI/CMLp9p6BGZyBnUUqS/v9JEaKWeqgy24QvnbOiXc6h + JJ3+u1i8bOZkKloi4UyebVVdxzpElw46TEZ/00gKOT1F/H8HjeI6qob/xo7/5WV0 + =Rwmu -----END PGP MESSAGE----- fp: "0x6D617FD0A85BAADA" - - created_at: "2022-12-23T19:08:38Z" + - created_at: "2023-07-17T10:19:51Z" enc: | -----BEGIN PGP MESSAGE----- - hF4D6iFd6webPCUSAQdAvWgpoETWm3MN1GxlJaXhbC+pKuUOXxiuXMgBnb7X/HUw - HaMQY+lmnMbfszWft0RCixormuYa7/o48yLlF+fhdT1PuIACHBa387EsL2FTFUC6 - 0l4BotCkg4yludUw+Ejp3u47BrmrlgurblJbzV2UVG7yS8ggDjtvmA6vkKGe1DVH - OegufKJwYxND0/jrXV4P6o1QxOrDdIDEKkbAUd5vAWzLF8qzj9ffxSIrb67VHKqm - =710r - -----END PGP MESSAGE----- - fp: "0xE0262A773B824745" - - created_at: "2022-12-23T19:08:38Z" - enc: | - -----BEGIN PGP MESSAGE----- - - hQIMAxFMPvz46t7rAQ/+MIKsX+VZxav9W7IIbV9QHsrX+1ZK2Qv2E1lBLM+d1p4+ - TfZs8YrIgchP5aiwNGbnYe6mELdKqPKRXGkljI9paWHGRM0fxHLFE+yhVSirNt/1 - 8DzZkTKEigtAUgBms2k/I5E1SedXXvK+kUDVDVm9JIIFSwXaWOQPSN97bUuTcfXM - DzvyliEDcR70N1dRSH2jk1PV7EToZeNdDwWvfW2aV5qclHn2e/1YHD22AN1h/yp0 - JpGhqq0e+JficNoGLxk8pG4cSnfeV8galkv5h32u0fopHPlLlQNMWXDjetqmp9yI - FeNvIsDHAnISTNi9knvlTPfCNYqha3vu6lgcYOPgBlO7z9KuC3FOCCmFZP08fuYW - R5zpkk9T0cjZgP2Y0no1zLEay6GJsZKRi/3t2nDJCLA1DIaJq4lykoRIj+13UCme - YkmOb4LbKXB0GbilY7SvBqLm7Rr1KQJqNkRYndhQ7z80ayvFDBDAj+N/VFlFsymk - Xdk0iTJb4P0yrey+R5d7q+5pqNjpMgQ+HYtM0HBjpXfi+uhb9E2hVdfDTuxwscWq - LvfPeKcQzpfcoYP1BtO659+FGEZezVJSXuM2BURFDr2kmfGUomrKJAnWwSTC9IDY - v8rX0gfw3JgtXNERO//HmBFX5x97vGx0JjSD+Bi/aEoOxIDuPxghab3e/CEZN7nS - XgH1OuWERqtr6FktX/NUrS0mUBHx92QsZNo9R4APje56qHT92ZqnvhZBXt7axAXt - QnH75wiFCcBGmrAPUhoXuZtinO6GX3zcY8UGCXJkukXohsUQI9UG2GS5/4dLFFU= - =AzfP + 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 -----END PGP MESSAGE----- fp: B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7 unencrypted_suffix: _unencrypted diff --git a/secrets/goldberg/secrets.yaml b/secrets/goldberg/secrets.yaml index 2705e3f..b156a3e 100644 --- a/secrets/goldberg/secrets.yaml +++ b/secrets/goldberg/secrets.yaml @@ -18,55 +18,44 @@ sops: - recipient: age1w3wqxt5t00hjv43dcxlr5rjec5mvuzz9ajc8k04azq0gfx0ncgysu6mdmm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2c2xwQVdsRXdmSVgyNjZY - MXRrT2VVak5wY0tiNEFwN1NTZmwrNlU2TkRRCjUrdDVTVlZKVHZ6dXk2dnZTV1J0 - dy9HSEZkWk0wVzhrU2dxRDFrVDIwU3MKLS0tIGs1YitLYlAzdlI1L2FZMXJFTWJn - U1lPUWh4WGlTYWdUb0dlNXZaSk9JWU0Kk5CxVOkZO17h0dYifV9s8g7LujLHcE9G - /iSC7EVUx+9cbOUiJf6dcomT+np7CHmhfOykPhm4tzrauaTuPEekew== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5MXhXalBKSDNvVFhBdVFa + bjgwQnI5bHNuRnkzYU9kRGZmaGFwaFk3elM0CkJWTXBVSjhkWi9VeTdJY1ZaZVRq + NWc1NzJkclFsL3lNdzIzNExmU3RJeEkKLS0tIEkybGZlSVdQNmduaHVVRkhhUndP + ZDV2NHo3Q21OWFRWVi83R3lNUzJ3bTAKocKimmoad6wid0/GVwu5l9UQ5dqnPB3P + DBReCwo4Rw57L0hf5h3Yw0HSwDHGREvHeGKdBMehd2DIEFA4OkWXDA== -----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: "2022-12-23T19:08:40Z" + - created_at: "2023-07-17T10:19:53Z" enc: | -----BEGIN PGP MESSAGE----- - hF4DOnsoj685gdcSAQdAlEcl/ZkyJbNf5/67lWdPi+GJYWNJAQezYrFgbzl6Smkw - saKYfPPixkdhuzdkgRzb6GageBoaWfIWmQ6MTj4Hdm3oNLfIh/egoMawy5ijjTLR - 0l4BlbxddhxMIrSTYBEKpXxp9iHtxbIKyJ/GT3PWPc85wvC1ILkpwTxqB6sGF0Rc - OWjqtCUlUawmPUEb0po9w9tFFa14/tDy/12ZAPGgj68fphCrJ9zml83VMMMKiVEc - =3rea + hF4DOnsoj685gdcSAQdAHmMntf+DL5LYv/69BFm7vv1zkcpv/D5gvo6Zs1UAp38w + +BGpZbkdHi8W0SgYCU6nE5we/2nCCMCp3da0ZENY6fLf1HazDp4OJ4YJkkwGrrrE + 0l4BCXiMEPxH43f73AhGnAV84k8AcWFUzXAzGXioIQVrR8VU6vtgQSNoaHyg2JRm + iVBHQVg5y8g0CgAW9mAR/tTfT0Fi5Pw9KiLyEfclLEy9wd4v2s2+0U8Ul5oR2u6E + =a9gP -----END PGP MESSAGE----- fp: "0x6D617FD0A85BAADA" - - created_at: "2022-12-23T19:08:40Z" + - created_at: "2023-07-17T10:19:53Z" enc: | -----BEGIN PGP MESSAGE----- - hF4D6iFd6webPCUSAQdAxAYtwQ/zkMsZviMYcxJtiyPRzhzBM5LfQCSzk5TGdiYw - +CcFFL5kYfZSozyLv4IUsI55Ui1aOnxeYtLKbwegbdE+ZKThBoUONACA3qd/PoIT - 0l4BkHdjR+w3BoBIT0EVD1BjPrQa9stfX66STc6OTCK3kDEoEPWZteQlPbWvj1yN - DTpdkpw/uEvyXCLtAGPOFZGjYTyc6Bqy/adIHS+ApwY02AqlpO84/RQIgz67iv/W - =Xo/U - -----END PGP MESSAGE----- - fp: "0xE0262A773B824745" - - created_at: "2022-12-23T19:08:40Z" - enc: | - -----BEGIN PGP MESSAGE----- - - hQILAxFMPvz46t7rAQ/3R1wNN4T0ztOj50C+swwMwO3HjjCqqeFUcZSqnSznppcM - +5BpsqTIMItBEwuuAc710HmIXk0VLHZlPEOpNeJOJkF5ZWIyagkRYlS99FO41NrH - B67nGYAWhX9QE8RXzzClUT+FTg2TBxqp4Cd4u6UfnQEYd0xjQA35u8ox0UUwlb92 - achXSsrq+mYgLTwV+mDb1xvAzcVX8M1cRpiuOJrKyFOWwWJbUqCmP4/Xc7uUgtDl - svYxzh6S4sJ6LS0QbfxZRE/xiZdHv15sf8ZWFK0eI0Sw+2BXVdb0tw0bhN+B1+pw - fsoq5RrqFBSqyVTEFpkUpkW89+vpNXJXgwahdcyyQfhzv7osOuXBzumrrAYz3Phb - RtOPsDfs9LpvWaXco7cItAH/jQ9+b0gwkMYiT9QSQFNuHHfutPZWQ24Dwb6SFAWd - q2rGaI3SB8ppu2RDiUZfepGt/d1F+GuIT7R8TYPGo9Ef6KhMSxTQeCZriukwVvkK - T92d7C5SELNw0NEGRUsZizYMQlQqcJUAtZ2LEXdVpwXN5etAKFKURwIr9wGHK2Jd - TDYBrbEtVQq8+QiHEW9ZDAwrqfVQmyPwgLiG/GH6f4F3DSB77Hxx3lFVSg4LlPxA - nTfv/aqV0YOBQlc7wvpMbI2Z0A6MaGDS4quVNGmUYgdM6V+tIv0Jzj68/Q29JdJe - AXo33DVHEZp88oYU3Syjubetc3NmeeSD9rro0fhWTHQo3ha4qXed9fRd9z9DFGyF - hkf9HZiMo0JCOJSs1awp7Lr7WX5EVNv6BRXy8pjgQP6QCojQSrn2JFfJa5TaEg== - =VPQ9 + 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 -----END PGP MESSAGE----- fp: B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7 unencrypted_suffix: _unencrypted diff --git a/secrets/shirley/secrets.yaml b/secrets/shirley/secrets.yaml index 32f8c37..ce84e83 100644 --- a/secrets/shirley/secrets.yaml +++ b/secrets/shirley/secrets.yaml @@ -13,55 +13,44 @@ sops: - recipient: age14ysl953378r2vvy7ft3gwce9xp83pr6wypf5lgx2yjwx2lxra5qs6j8eqe enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFSU9DMXdFbkNNTExCMURI - Q0VxZkJwL1hGL1pyNE9MM3RMeGV0eDNMV0NrCkRlc0hHUS9ydVc4VXFPQUFhaWhC - RjBmYVh1b0RXQ2c5bGN3anF0NnJSbG8KLS0tIDJleUhIN0lwbkJmbWxaMlU1OU5j - YmRyblR5NkhkTXc2MlhlcWtYSUV0S0kKk1lgI+wDwPUCTOWEBnMzSlrHwNNaB3/D - ykos0itANTZjLcawhrOX/p8qBR2NUJ0U8On5Pls16UMxfgAkdJtkcA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4YURSRGtkTlgxenp5NjZu + MjBXdlM1MEtiZXVpSFRlYlo2eU5INHV2Z0Y4CndXZFpKU0hxaTdkLzdMMkFTQjk1 + amhYYnZJaGkzWmlaSEppNFRQZWpKMmsKLS0tIDBDOHM4VFFFUloyamdYSmRSTVNG + L2hyTVR3UEk3ZFhhUSt5TkJEdmNNblkKdBc/6IgWh5aC5hf8xYD0AdQ9Bd70gAZ4 + 72EW4rTaCs2puS0D669SiZvj2a2Wo8ROB2nI7aqe7NXU8AKti27Dxg== -----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: "2022-12-23T19:08:27Z" + - created_at: "2023-07-17T10:19:47Z" enc: | -----BEGIN PGP MESSAGE----- - hF4DOnsoj685gdcSAQdApJAg4rRPKyXZsF9YP1hMD+TIra8gR7fbVGCqyioJ1lgw - UTIBs8SddhshthujqHQv5mgrH56bkviO5Yllhow7LVNj7EB8ijXJpiNv7ZDeBjG6 - 0l4BAiyvnceSWbPFqOCha2QXfKjDNIeXYY/9o+hLRwkCrch917lw4D+2udnUF/s/ - 0IgNwir2+75LV5pRBF6h1QPiOeWzDI79s3zGx7MiH7k2X885jXbum0z4bmXkrO2g - =4crH + hF4DOnsoj685gdcSAQdARisY1LCrLOlOgLMc/sc/mBUFv5M9kmNGc8JAKPp76EEw + yypiFVuIiOeY+OQPwb4Elzn3BG1qJrG1aRM4SndkrQ5xJtbSXJ0YTKzNC4z0O5OC + 0l4BNagF5kqZwhBNd5bgSlsecHgpGVOHJmNK/BAp5tJSRERYhJnHa8nmkZIsvi2a + WCIiMe3OygS67AcK7p3w/3See78ArrWw7/nkRAQRbqTsdMG6aFAj4N0yDTGld4Re + =eu7k -----END PGP MESSAGE----- fp: "0x6D617FD0A85BAADA" - - created_at: "2022-12-23T19:08:27Z" + - created_at: "2023-07-17T10:19:47Z" enc: | -----BEGIN PGP MESSAGE----- - hF4D6iFd6webPCUSAQdAtOH3U0gbPC/yRb8ffDUt33Rpyop+71RM4LKCtpq2lFQw - c+XtxvaXbOSFNOfvrVqHMwvl5w1tpoItDlcCuKPjFUIbYJ+reeciRWOjelaVSrel - 0l4BYEE73k2iu0eTbeBmOfLAVGhqt3KlXrzwLG+JEyty3q6V2zl3UgTZm3lb9M5g - eJAnVpYuyqjWs3lBj1ZObj3/s/CNIw5+dDnBIXRSldg/XGIvjKbM2NpJucNyIVke - =yMSq - -----END PGP MESSAGE----- - fp: "0xE0262A773B824745" - - created_at: "2022-12-23T19:08:27Z" - enc: | - -----BEGIN PGP MESSAGE----- - - hQIMAxFMPvz46t7rAQ//Wxr9k7krKg1gOfsdRioLOAosbhf4G+zFyuA8HtsTApDN - vCqh3pOVNspQbm32Ciwk5eFbT7wvJgk/tXDVQ6xmuadXDLedvgvWjeFawjMI+Xd5 - 9qaY10uD6amznJX1xk9ifA9meJt0SKaMGji+TpHY8/pqEec7bWnDgNUpy4o+2if6 - jTui8K7SwTyigmuTIMOb4Bmqd8AFS5QxK1Gz2xCNMtwSAVN5MHeHRj1WXby33q+B - DWj7oQ3BCOWDdA77i/xJg3ANzmv1LEdQ1cxXOX+7xoB1gsmB7uz7+KwkGw6pt40n - hmxhY4JWcr1pJ+0mVfQXm8zmK8dFpQiHwsZGlQ/n3/uzjaUE9VgCFs9W/qrdHXtv - PTpnqtwCaFUEwYg72481z6tNKf8Sv/IaFEF5nh318LHrrMh6TzXAGmoY96+/T05F - kk42SqNgr61apneJV60pfEhfmqD9znT7fx9O+kRpt4kd3Q7ubmZA/yGItSqTSUmg - rbS5YiBSVK7JFVwhyTBf+auamBWzg2mufXuILC9wBBcoqaPRpOaZH0ydP4rzoJ1O - 4BhTDxcoUxfBi0gRd9mg8YHP2+gdvYRmBhE2w1LOibFWI/2FGvTRE87e0Dh1msyN - VKQIQq4VUvRU4i17YIf5dRsatOegXvxbUvT9rI6xJ31R4OjH90SSR0GR+BFrHmfS - XgGCO6oAauUjKN3ocN0cUJqYCSkIRWXLNQBOy3lY1vw40vh0kYqO5C2OiUEZeTOW - QeRp4C0qU3hn7daxt/w2rAQxPNs5WCrLhO8jDR29GUX236Pu+h7cV9eb0f0RRUk= - =80xe + 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 -----END PGP MESSAGE----- fp: B1480CFF9BBE8E2648A26A640B2E7C171E3AD6D7 unencrypted_suffix: _unencrypted