From 32106c4c5615a99964a7211711e8fb524ae4760a Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Sun, 22 May 2022 22:43:04 -0400 Subject: [PATCH] fix sops --- .sops.yaml | 8 ++++---- secrets/lastfm.conf | 10 +++++----- secrets/matrix-community.yaml | 31 +++++++++++++++++++++++++++++++ secrets/nathan.yaml | 28 ++++++++++++++-------------- 4 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 secrets/matrix-community.yaml diff --git a/.sops.yaml b/.sops.yaml index 0461f99..697fd1d 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,10 +2,10 @@ keys: - &nathan age1ud80054jwf6ff7xx65ta6g7qxx2flc24r5gyyfjz43kvppjutqyskr2qm2 - &levitation age1tsq68swufcjq6qavqpzrtse4474p5gs58v6qp6w7gum49yz45cgsegxhuw - - &oracles: age12ayrv88xjt4r276fzc9du70x8q0r7xutt85vj627ykf4k8kgms4sc6wyw - - &perception: age1r0aszjkyp4zlcw2w2vrk8hmcyvntshr8rew4ehlu5zad4eh6mspsatuczd - - &shadowchild: age10zd0y2zpty2z39sh2qe66yuu9jd6hrcd3ag2wqtjp8tc579nmphsymhdla - - &matrix: age1pm647k04hhwm2dmqh07hnzflkurfevefcyf8xlhmc83a07n77e3sltyt0d + - &oracles age12ayrv88xjt4r276fzc9du70x8q0r7xutt85vj627ykf4k8kgms4sc6wywn + - &perception age1r0aszjkyp4zlcw2w2vrk8hmcyvntshr8rew4ehlu5zad4eh6mspsatuczd + - &shadowchild age10zd0y2zpty2z39sh2qe66yuu9jd6hrcd3ag2wqtjp8tc579nmphsymhdla + - &matrix age1pm647k04hhwm2dmqh07hnzflkurfevefcyf8xlhmc83a07n77e3sltyt0d creation_rules: - path_regex: .* key_groups: diff --git a/secrets/lastfm.conf b/secrets/lastfm.conf index 0429443..88dae96 100644 --- a/secrets/lastfm.conf +++ b/secrets/lastfm.conf @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:XE+nrKSKRY/dqq9vd72ibd0+pR3iqCNuWBa9x2JXfSkGuH0LdPhL+veGLyLsMRM5YnNdvNzsq1+BBAGOdhWRcJD8gNMoJyUy,iv:ZHV/53GY9ItxfnelAz77+FPp7skXpZIEoGRTqaP3rr8=,tag:pQiBjwJih1rFn7RYJSCs3w==,type:str]", + "data": "ENC[AES256_GCM,data:oOtQy15abXSDyeokVMenOWgw6r0RRBiQ7YioT20Qacjd4WYWiBY3iKledcOSAVk/8sL2UJrxO5Jn0Jb/iEgxlpsRhZsBy+Ta,iv:ZHV/53GY9ItxfnelAz77+FPp7skXpZIEoGRTqaP3rr8=,tag:Ei3GD+Cm9spnx52OsBo0mw==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -8,15 +8,15 @@ "age": [ { "recipient": "age1ud80054jwf6ff7xx65ta6g7qxx2flc24r5gyyfjz43kvppjutqyskr2qm2", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoemVRV2xyaVNTTlRNOE9T\ncDJhdVJGTlUvV1YxaGZlUWl2TlM2WE1BRXpnCi91SHM2R0liR3JsM09URTNXaGl1\nQjBaTnNKaTF3dHBZLzZ1NWlRWmZpOEEKLS0tIHV5NnFndkM0THI5QVNEdXF0T2xE\nNVpoTWdwZWdNNk9xbk5TUW9KcWVkeEUKcO0uIrnzHVv+C7ndUEqqez6E+g6QVChn\ni4WoJiUj9sbhtRwy3bPAIYctGHrZ6okUW4FM0N9RRXuFqUjnswWh4Q==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBldk10aElCTUhnT1NnL2VE\ncmxVSjAvRW1ta0hzQ2RkL1p5eTZ1RHV1bUYwCnRBczk3K1RkK2hHWHh2UG5WeTFp\nKytSbFhORzJOeVJDMDhaUXNzV016K0UKLS0tIE0xVXBMQm50Tmo3UVBhakhuZHc1\nRVZxYUdKMExPdTRmN2NIME8zY3pXaDQKiKcFgWhJnkazqETFI+X0CF5MEztMLZJ7\nqLAqrPyCq048BMr+T2tuFsWnXDrQP9TdF4bKZbVu6bRERoFt1booLw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1tsq68swufcjq6qavqpzrtse4474p5gs58v6qp6w7gum49yz45cgsegxhuw", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvV0tXK2NOem5LZkh2NkJU\ncmdoc2RvOThQNDdEU1JyMXFPcFlHVk1aeXhJCmtYT3hrZ3ZUTTNJcGZ6Q0lSQ2Iy\naEs0ZWZjT1BJVENJY3RwN2VmeWdnN0EKLS0tIGN6ODVuMWpHaTRGKzgwM1M5R25T\nVnArZW01a29hTjRtMTNXQlNBRlQyZ3MKFqI3OfyFaPd/Jkc3x6IBd2eMy2GZJXis\ntpLiIsStbP8tdm7Zas3yJRLhALS6/PTMooN8Pj787AttBYvvTWSeRw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMelJQUTFMalV1Ni9uOHFx\nUm9COE5oMHpvNy9jZmhDaHpKU2tmR0FSSGxRCndibnN1QUNXNk5MMnoza2doOXBG\ndzBBMCtYbjg4WEZWV0pnVVcyMWo3a3cKLS0tIHNTZzZEMktESWF5dSs4ZW10Ykth\nZ1J5Y3lZbElJUGlJaU0zNTR6d2ZTVE0KkW+mJDTlMvt2tCoGeqgL50RU0PArH07q\nLCxoj/7MRV9BegKOrThJ+IfcfgLWnTB2XGGf8wIBAQbseb+H+Uq9Zw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2022-05-14T04:40:16Z", - "mac": "ENC[AES256_GCM,data:o/INM9BqWR61ceTYNq21GbiqpnyyqOUSzbtv6ovFw2wmdHo0n74AWGZob/c1dUEG/1HC9cLcQjTbbDYc8LAJGk3ulQTebGAtWxWgSU0vaAiphAfKnN7Oo0UWhe+hbaKbn2KMfeJzl7q3pnirjCmnKL7ZhWjhtUiudrrLPFQoYzc=,iv:BX6TxDzNgaaAL/iYTDNRzhU6EX5N0Kt1SFdZQ86UWmg=,tag:oKAYWEI90K63zDOAlfnOjQ==,type:str]", + "lastmodified": "2022-05-23T02:43:23Z", + "mac": "ENC[AES256_GCM,data:gMQTP8HpmdLO5/X7EMDWAhLy5TO+maOq7Kk53JBoVWJYR5kEU4bK2KN8rEArORICcs7MtfRAPRxsivlxGN+Erhe/IRUWwTMDBekppOh16iNw1leStwomHSe5nhJvBzEf8rRWynojp7WzfAalpfAD2b77cCOUviXh3VWmB2olcqc=,iv:hBHLKWPaEIrcCk6vkefgZQkkjSjN7x/bnajTf1D28LI=,tag:/W/WAAFON7U7M0yA/7Cxzg==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.7.1" diff --git a/secrets/matrix-community.yaml b/secrets/matrix-community.yaml new file mode 100644 index 0000000..1b24399 --- /dev/null +++ b/secrets/matrix-community.yaml @@ -0,0 +1,31 @@ +community_recaptcha_public_key: ENC[AES256_GCM,data:+0EKbzHODlj5y0zFyDpx3YTCnoWAx0c9SeYE5xLG0MvaRDR9hhL+2Q==,iv:pe1qqcGm1ZTDkBIbn/7sz9SwrGD3/d0W53aablJOhps=,tag:yilfX0hlGfAjHTqxjMXc0A==,type:str] +community_recaptcha_secret_key: ENC[AES256_GCM,data:G0AqjIH5HVG/1BMqDvfU0q4Fctm485AfFBIFH87qDFRKvak+Nz18Qg==,iv:X/AGgV2rCHfFEwAbFLrNH3gWenpOb17xDnbzIDN2Ca4=,tag:cU/kN+mOvsUx+yXRMM+lgA==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1ud80054jwf6ff7xx65ta6g7qxx2flc24r5gyyfjz43kvppjutqyskr2qm2 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYcjl1amRmWnNoMVc0ZHBl + d01SenFsM25lR014SFNRaDVVWDNRSGlyV2hNCm1Ibk9rK0EvUWo3SGFBTHlzZEFL + N3U1R0Rrb25telhjR0NVQmk3TG9FazgKLS0tIEJIZ3M4cmdPUVliSGxuMm1ydGNM + SThSOGVIVjcvR1VUcnUvQTdKQkcxa28KsrE00JbE2w18zSeijAqmhKXuvZdfVqWI + A5RoXDz9yOE2TNaojaRFBIudbNAJWiCy8J6Y2iFKKFvPLo9ChigfGw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1tsq68swufcjq6qavqpzrtse4474p5gs58v6qp6w7gum49yz45cgsegxhuw + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVaGhab2d1cFFmK1VMUjhQ + c0RTOTkrTis1djh3a3k1RkkwQmpUYk83M2dVCnlNY3pyM2JSakNydjlTSkdUOFVJ + Y2NlV0ZaZ0NWZkR3UmVvQXpnOEE1ekkKLS0tIDhWOTl6Wm8xekZhZUdmcnRFY1ha + ZThRbXh6UnljZFhNVGczUjU1a280R2cKq1pY/Ju1d1mYFuZaTivsvCefhtL3E69R + jBCLqwVPlK64meXI8hP1XDEV3KLGgiWbS5oAlx7VSF1OW+nwrOzSUw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2022-05-23T02:42:32Z" + mac: ENC[AES256_GCM,data:zKKeZO1IjxSavd9ocvPzX46Tvl5rTDo5UPJ+s0aqOeO3LucV/JICXEWtk7AWbgJY/BWc27jw/k8zpKsbkh1EPwMeMMFniY3YAt/lwov187fVM+rSZ1YtiE0xxgN8oBJQ3QMZJCt4QfAmVOMRokH2YO3kWEipEGjnuY9tFfd/kAo=,iv:jy0ReVsFNbrTHnVJk8Hyd/7l6Px48xlhFNdtTANL6rE=,tag:rMoYC47W+z4I8Eh5DYrEWg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.1 diff --git a/secrets/nathan.yaml b/secrets/nathan.yaml index eb07201..32d3c72 100644 --- a/secrets/nathan.yaml +++ b/secrets/nathan.yaml @@ -1,5 +1,5 @@ -lastfm-username: ENC[AES256_GCM,data:Y1sha5vuxA3BqT5TNg==,iv:9JSXwl+X5eKIoJFjOt7LntlK6iQcy/Fm1ViG/J3I1d8=,tag:HvhifVUJBKfowImlrTL6ig==,type:str] -lastfm-password: ENC[AES256_GCM,data:gTm22vDOT51oqOBq9Yjlc5dvK3eV1y0Y,iv:olko3/QHnNPoNpEMUeGL77qxphYLGhHSnn+ru5ANd2U=,tag:wkehNBtmiwdRB7LAFbCMlA==,type:str] +lastfm-username: ENC[AES256_GCM,data:uzGMxSMjnUYLF0Mutg==,iv:9JSXwl+X5eKIoJFjOt7LntlK6iQcy/Fm1ViG/J3I1d8=,tag:MAsE2f3qxBTYS+gt783jow==,type:str] +lastfm-password: ENC[AES256_GCM,data:U+jEt8sY/kB7r1y0odqf0fs7jt5Jj2ra,iv:olko3/QHnNPoNpEMUeGL77qxphYLGhHSnn+ru5ANd2U=,tag:iXUy1CnZmI6cDj5dy5U3Kg==,type:str] sops: kms: [] gcp_kms: [] @@ -9,23 +9,23 @@ sops: - recipient: age1ud80054jwf6ff7xx65ta6g7qxx2flc24r5gyyfjz43kvppjutqyskr2qm2 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBY0pTSFJsVmp0clVacSs0 - Zm0wMzhMWG9wYTFHSFRRVEJFQU05RVF5VmpVCmtkeU1LU3IxNUtGWXI1L3Y0d1F6 - UXJXM2x3bTBPS2pZNGFZY1Awc3hpb3cKLS0tIEZmSXdrOVI5amxQdEMwSVg5c29W - MFZmczNqR3gxT0FidWxRTWxiUjVpdVEKxau5QOQxIoKnQ4X0CtX4U2rhQ9b27mXd - uc4a75+fndh5bL+Yn4OAJyVBYHSALuASXOe+P7Bl+NdAc0+srEHEnw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKVWh2dTZzZXE5SWtNVW9K + TFp3NGc5NndvdXZUVzVCOHhPQ0Q4TVRwVGt3CkREOFJkc3dyck0xTmQ1bnhzSHA2 + dFdrVThwajMyeS9tODl5UHpUQWk1OEEKLS0tIGdsaFBKMDR3RDdSOUU0THFpbXJy + UGZ5dVljc3F1a080TnQ0UWpRQ0tVR0UKbMgZKAHeLWb/sgMNbjO/SUwAeiaSiwcy + TbMu1WJdG6CJKxpsYiYvSo5S6FcOp/xWYh3+893zkwoL31yf64NACA== -----END AGE ENCRYPTED FILE----- - recipient: age1tsq68swufcjq6qavqpzrtse4474p5gs58v6qp6w7gum49yz45cgsegxhuw enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuSG9rVkVOelg3YlA2Y2Zo - QUIzUEJOSkF6Nks1STd3aU1ZYmdVc1NvdVRJCmQ0cFdCNzk1aUdHbTBMRUowb0JO - TzZadE9NY2w5Z0hPT0J5RmcwT1pVVzAKLS0tIElKcWNnOFBWRUVTd0hZSjc1WUdF - ai9nTm1FZ2VXb3JVNGd3T1RtdHE4bkUKwKqwFT5ivez8RXixRrTBZhzqKRgNtbbz - Z3zkstwF6Thh5D/sJW878BvaD/TyujUY5HSP43igT0gQnYTnCQHYlw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwZ2R2N3p6K2J1ZW5oTUNr + WVNBS3A2T3o2WXhRU216L1F3WmE3V0tzNGdrCnh5OVVXV3YzTy9UVE9qWE4yNnlv + Ym5EN0QyU2xMMUw2TWlSU2QvdStPeFUKLS0tIFZpN1drNkwyWG5TRWlULzVFb1Bl + NW9lVmdFOS9KSFFld2F0VVdZcjRhR3MKpwRAfTUHogYp3XKdXyKih/DxWjEy6D2o + 2a0cwtZ3+pHXxMTJd3wGvKpPNPO58YO4lgIUuwkR02upLzIre/KgRw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-05-14T04:40:19Z" - mac: ENC[AES256_GCM,data:5ySvc3EgCmZ0nalKD6367WrdQVpGlPhjf7VX4QDBMAZ3UE+b8eEEPZgZogffyJdO2vZgtM6JI71r7XrmAeiOmwGqk36cpX9thFsPBSj5MA77pA0UAfha4Jxjz6w/7wVEUQVyPXfwQPc+Qzs1DbRjIGoKbiPYm7SbbwqKXaUC+qg=,iv:L/4T9jV+Bz9sWtcwkn7rF26kYJS2o8GvcygaTclAaZw=,tag:Nc/kGBU6pFTiDa3fQqcbSA==,type:str] + lastmodified: "2022-05-23T02:43:17Z" + mac: ENC[AES256_GCM,data:T/zhvzP6ziH0gKcy694VlX7KSQRlk559REAuR7NfkxvhFhi7WwOOnBE336q5s4ebfGWUqREOzt6MXTDILVcjwbBC8HZ8sDInx364KXfmcSo8C/Md4VgDIqFYBsLYqJNijY34gCtycVZYAc/UBoNztpdtZYMkhBFgzb1DLcaaS3g=,iv:0S2wpefnXpeK80QVbnoJ582BZbZA5CNg/hJd9lLV75k=,tag:Wzz7T9f06bCYirUmaawLMg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.1