From da51761159394fb98bbca97aeca535f6c1c7b13d Mon Sep 17 00:00:00 2001 From: harry Date: Wed, 17 Jul 2024 19:38:20 +0200 Subject: [PATCH] tried various stuff to fix the json returning an array --- features/freshrss.nix | 8 ++++++-- secrets/freshrss.json | 25 ------------------------- secrets/freshrss.yaml | 31 +++++++++++++++++++++++++++++++ secrets/service-key.json | 6 ++---- 4 files changed, 39 insertions(+), 31 deletions(-) delete mode 100644 secrets/freshrss.json create mode 100644 secrets/freshrss.yaml diff --git a/features/freshrss.nix b/features/freshrss.nix index 702ebc6..02b87dc 100644 --- a/features/freshrss.nix +++ b/features/freshrss.nix @@ -14,8 +14,12 @@ in config = { sops.secrets = { - freshrss_username = { }; - freshrss_password = { }; + freshrss_username = { + sopsFile = ../secrets/freshrss.yaml; + }; + freshrss_password = { + sopsFile = ../secrets/freshrss.yaml; + }; }; services.freshrss = { diff --git a/secrets/freshrss.json b/secrets/freshrss.json deleted file mode 100644 index 2a56aa9..0000000 --- a/secrets/freshrss.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "freshrss_username": "ENC[AES256_GCM,data:NEItAxE4TYwO,iv:y8jgacv4vvDUeHBVJhzRVCRAk/keHGkvv5zRXyeEFBg=,tag:GVejh0gYqt5t5Qz3rc5HlQ==,type:str]", - "freshrss_password": "ENC[AES256_GCM,data:OVlz0sUkmGpTC5N7vMozaRHFDwpjg19ww7Q=,iv:47BrlJZEOyAqPl/vhb8dE4DQaEqiCy+r30kjDjY+DHI=,tag:40ZMA/svJtL6oUpM/CjMMA==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age1c8kr95dc7cqq34qyjgpnsgfgyntqnt5rlrq2c025ehp32f8h3sjqkf8k3s", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGTlJjc2tQcnFuSDR1UFI1\nN25rUUxueGFwbEpwOHJ5N1Z4UEpKampHU2tvCk95NzQ1U2R2bGwxQnpRczBXclE5\nTitXZ25aQjNLc3ExS1g1NDkrdEpiOHcKLS0tIFY3djBzZFFMcDk0TnpBakU5dUZT\nNzBUU1FaUVJuNGhEZ3U1R29jUEdNN1EKKHlGf/NzD5iJXDfU8dmQTQL7dM9guq7q\nxtAWs/5/rlU5Di4unsbIIeV/t8AxHw963UHGNB9ZOXipHbz2ofXHDg==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age17pq9xyrcv6tlms9sznnhql6pejue33r0aukn72hzpcn4jykrg33q4u0a3m", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiYU1JaG9ZYzJJcmhlRCt0\nZWdMTFg5ZXJJTDJyQTdlNXg5L1ZoU0d4UG1jCkkwSmhmZzFrYytNaWZIamI3d3Nr\nZStCVVY1U3YzMVl2cXVVQzZoS2c4Rk0KLS0tIFk5MWt3c2NHTTJHYnJ3M3hTazlD\nY2F5SktLY1hNcVNEd3RaK01oZDFFT0EKiyCC0zzk77Mtg8M+ZycvwgTems4LZxiQ\njE5tEnqb4jTMQmdONeUhqtBRTl/0jcJugelE04hQvcMvWlk+bwBtyg==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2024-07-15T16:59:23Z", - "mac": "ENC[AES256_GCM,data:LapxD0GUnW1lmCKb7ka1pI5U3Xi7HmQ1gBtWGvnMtwsReCYffdH4NdMr40UFRXfykptLz5bryp+4islyUcY32TCZ2OFT9rNDoO1kUCSySIhT+Y+dXRPfX/XpO/bC6T6J0Ojcvg38TXf56+5WoP2+Ecc8+q2iISySZxlXjISBAYQ=,iv:6zYA8xsn7FoMmTmqAfqZ6lzvVh3WJ+4ZIlT5V2EEU4Y=,tag:AOQlDMEXvp+EA0uy2dZPcA==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" - } -} \ No newline at end of file diff --git a/secrets/freshrss.yaml b/secrets/freshrss.yaml new file mode 100644 index 0000000..2c44065 --- /dev/null +++ b/secrets/freshrss.yaml @@ -0,0 +1,31 @@ +freshrss_username: ENC[AES256_GCM,data:uI/v5MkcVBGp,iv:oJlUscDy2dzXQaMj8O09tt8QM6bNoJt40zdZVBW47ho=,tag:7UiBpFYpZHmfq3WhquC7UQ==,type:str] +freshrss_password: ENC[AES256_GCM,data:fCOjuis7ULvsTg0H5tMVnbHH+Pihv1Ezeq0=,iv:5sTcJBdsV/zJ23wb7xueoY9npVDGPV5kbV5IfUyP4yQ=,tag:Ws94G1v8smU9E5xBEARRTw==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1c8kr95dc7cqq34qyjgpnsgfgyntqnt5rlrq2c025ehp32f8h3sjqkf8k3s + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKaGxtWDZySE42eDlMbFVP + cHRCMkt3VVVEY25nd3BBR3FBZ0xJNzZIRW13CkJNQjNXU21UNWx2Tk5zcFgvdEJp + TmwwY0Nxd1k3WU82a0pyeUg2OUxzT0UKLS0tIFE3cGd3SllibFBZdVZJUzhSaldF + Z3V4cEhEU05HQzh4cUU4cEpRN2ZtK1EKQSFyLMrWk1xpkNqWD+PzVdTQGQ0qgCtU + y3327TfcYsmEHcwmXaDPGXAnxSb0XH3p+kiLV08MWiCYxfs9YVZUDw== + -----END AGE ENCRYPTED FILE----- + - recipient: age17pq9xyrcv6tlms9sznnhql6pejue33r0aukn72hzpcn4jykrg33q4u0a3m + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwZ0NIMGJ3N2xWOUdONk5o + SC9CajA3c0Rkc1RsdERRbE1OUWUzNHcxZlJFCklSa1g0K1lUZzhyQlBzQ2xWYnUr + TjF4LzYrcTc3U1ZnODE3dlllelNpTlUKLS0tIEJOcG80UUs5eTM0azhCaXJnM0pE + a05vSlBPamVwRzlWbHNSRXdLWlkwOVkK++2TcdjTKt+G0dQYqUeQzYd9MHkWIPwq + z4aCH5g0MKNJdqEVDlSh+M91wPYkCuZChLZhB26ExySzN4BQZYobIg== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-07-17T17:36:47Z" + mac: ENC[AES256_GCM,data:26oq8oai6g3KjNq84Wj5+kQOZmnVnfPa221v1SCO1rTSC9dLm3zjiB0JfOQGxGvxKRm19QFKUd0rYbfFNt12O8jG9oIyYBExjawB1aBaY31TmU9ziey07pwLJN8AuRshSRFLWVbNz+NPhnROOoosWFsQhnQS4xBJxYHZ6iYA7co=,iv:thGKLGVTBWMxh1tgYBsMJtbarwp6Ny0EEXwcmyAAVgQ=,tag:8QgncQXPjQalelSlBfRbLw==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.0 diff --git a/secrets/service-key.json b/secrets/service-key.json index 7c81c70..1b25318 100644 --- a/secrets/service-key.json +++ b/secrets/service-key.json @@ -9,8 +9,6 @@ "radarr": "ENC[AES256_GCM,data:njeeGbkK8uII+EyfppJ69Nxw8ioBE9WX890WuE3KhZY=,iv:bft6e9fAsywILDnXtBRvme99C4sSf1vF6s6W9n8Sw2g=,tag:LL3TUaW5uRspBs/Ngix/uw==,type:str]", "pihole": "ENC[AES256_GCM,data:Bqptls/d6aKe753+uMwozYNLkF0ZJ7y1QY9qjm3KaPyIoWyCeJ7nh/o8bIUdv3aZA/0+SPVFLPy8r/b0gA7ncA==,iv:mxr1IQ8um7n8FdLBVGtCLfbiKha91+mZqkIhhZO5cwA=,tag:88A0eLL+CkmSlIFf299Oxg==,type:str]", "uptimerobot": "ENC[AES256_GCM,data:OFeM8ZP7ZdkptLkn/UD+eJfTEx0GQhqHcOEGNJjX+H6s60I=,iv:1vQRhPJgZmZwgXdXPXmlh/NRu/2GiJFtVQwjhsxC9uE=,tag:zxTig37FR23Ktb/1ZNpisg==,type:str]", - "freshrss_username": "ENC[AES256_GCM,data:AgN/35zWxHe2,iv:n+QUNXfvHQMBzlbs83WKr5Vvk2bnq0uhNibAL5do7lk=,tag:htK70Dy6Q+Ji69flKjHlEw==,type:str]", - "freshrss_password": "ENC[AES256_GCM,data:AiYgTE046MA81xEt/OD6tgbLwXWxYOfcmqQ=,iv:DpOna/s4Zo9slL6nSno4nSu1+tn2WjMmhvzCKD7sAaw=,tag:aeCGmLVaNxYa5L3n3MdRoQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -26,8 +24,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIWStBcnBiU0dRbnZ1TnZ3\nT2NNRllHL0VwbTlyQnRYUFFHeGdZM0JtVmdrCkszVkdxVW1CTWk4V3RYUGlzOGhP\nOUw4WEFZVmlTTTVwTWN3OUtlN0lQR00KLS0tIHp1SmxJQUo5UDRBYnRzbGpUK283\nNGtUMzBhTjk1TjF5TS9XUzJweXRUcG8KZPQOfD5+z13mlBgRqJ+T2Zpz0y+dlVX3\nCVC1VmHwgOUfSnB0wblrvCvFgb5c6amId7X0zaeTezmYbl/U7QU71A==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-07-17T17:02:10Z", - "mac": "ENC[AES256_GCM,data:vUKpkwsFPBKFzMQIgP2vgcR2JhWnfkyAIvNPPbHOscvkwrIi0yzxnSj3LugdNwu2HjaWPFmw4yafzY1MSBAXrlmK6kiJ9yUoIvzeuiYfDOVNN51c53L4Y5XTvJtUoC4mRq4eYVS61j1q2gVs16WscxjZC7R/BbHLKa4K7OU/g2w=,iv:6455eDGLVH7PsKZtHLWMiKD1C8m43dkqs2KG2Q+wFP4=,tag:9Uk8J7TyRq8Q2D6eEnl6ew==,type:str]", + "lastmodified": "2024-07-17T17:36:57Z", + "mac": "ENC[AES256_GCM,data:feJKJ1JFklbUrCoM4Zh6aD6G+/jzUqS7UWExa2U2j93g6W4QBq8h0g1/4CVKQ/ZwsJoRtWXpoBPQ4spqf2q3BwHZ3YhqIO+ulyYPU2Hl5Gr3eGBlQZ08zr8NcZ/V1zdJ+ZgnApyQ4IuFeD++NoCxzHbLokBP+b/HFvrnsubCkPY=,iv:URLSMtDh5mNWM959SYjPQewMCX4dq1Do7ivCKzLcKCg=,tag:wbwKOleuXKAPZ6SjnBlJHw==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.9.0"