From d23e73a4bafd0380ea7285d6adb994974b1c2cc2 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 13 Feb 2025 22:40:30 -0500 Subject: [PATCH] oauth for zipline --- hosts/chunk/garage.nix | 2 +- modules/zipline.nix | 5 +++-- secrets/services/zipline.yaml | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hosts/chunk/garage.nix b/hosts/chunk/garage.nix index a6f39dd..e6c8af1 100644 --- a/hosts/chunk/garage.nix +++ b/hosts/chunk/garage.nix @@ -8,7 +8,7 @@ s3_api = { s3_region = "earth"; api_bind_addr = "[::]:3900"; - root_domain = ".s3.cy7.sh"; + root_domain = "s3.cy7.sh"; }; s3_web = { bind_addr = "[::]:3902"; diff --git a/modules/zipline.nix b/modules/zipline.nix index 9647525..b66cad6 100644 --- a/modules/zipline.nix +++ b/modules/zipline.nix @@ -18,14 +18,15 @@ in CORE_PORT = 3001; DATASOURCE_TYPE = "s3"; DATASOURCE_S3_ENDPOINT = "e3e97aac307d106a7becea43cef8fcbd.r2.cloudflarestorage.com"; - DATASOURCE_S3_BUCKET = "cything"; - DATASOURCE_S3_REGION = "us-east-1"; + DATASOURCE_S3_BUCKET = "zipline"; + DATASOURCE_S3_REGION = "auto"; DATASOURCE_S3_USE_SSL = "true"; DATASOURCE_S3_FORCE_S3_PATH = "false"; FEATURES_THUMBNAILS = "true"; EXIF_REMOVE_GPS = "true"; CHUNKS_CHUNKS_SIZE = "50mb"; CHUNKS_MAX_SIZE = "95mb"; + FEATURES_OAUTH_REGISTRATION = "true"; }; environmentFiles = [ config.sops.secrets."zipline/env".path ]; }; diff --git a/secrets/services/zipline.yaml b/secrets/services/zipline.yaml index 21844ab..b82f9a3 100644 --- a/secrets/services/zipline.yaml +++ b/secrets/services/zipline.yaml @@ -1,5 +1,5 @@ zipline: - env: ENC[AES256_GCM,data:0mWks20tBUtBVhJIqEyW5jm5cIgDPcyYS/Sl1ulCltandGHFOa+A7aP/VbvVp+7FO5VhtC3CtLt3Jtcr8/dEnJoMFWsrliZ0ZcR/Xm3TtJ4yfhmVbuK9lyUrgPP0RahQzFrQZo0ZCOug/f8suySm3mCnMz377L+Gu0+MMZPebVP724k2Xj5zpSyF288cnOG2QDNAo0DCrrFep31a7n8XbOduOupop5PRLax+8lFKRYgZbRSPaaFToFCoSxU8Y+W3tkB+mtwIsOtIeQigAVYEJ/O1kw==,iv:4n7s52m63gQ3fX+eW2jGWC8NXhPuq3nNSmmYYZxqqXg=,tag:FiYn7L7L4O0+nHI4n43Jqw==,type:str] + env: ENC[AES256_GCM,data:lsR/+bET/C7ssik0xv5IBITT+KEnoyqNjSZ9jvkkb7lmNAQzow6dCm1nprfimiJC0EF2LyiEPm0wchdtrLTNEtUkJWkworEJXeWGrGGbHgZW0/HC1BSERqlLmZTPyLWkhsl3rObvuhRoTKlUN5EMwtK8x06aOX6PcxLdwVjps7UxkBXej712IcKPvHVSJIQMvVHP2lqSppJc+sEMt4u3Vnf1ZYGsQS3bWnI7w40sOdGR8LGBadfmWwIj0/3XTaG7S7Lhi4AOFGZtpdyOmxxIH3Vd5qesfiqPHm0nTmu/JxPftYm+F/hDnbJHrbg7cNVlJahDFtQp8QdlVvdMU3ccNptpRXGWIwFOz3JtuzDo7pxkYRqO2dKqYbKhOknrMW0PYuB48XEKj3e4Q+T8tUhFTsOHfqT0J8ati26dQaUO5wvw22o=,iv:QeR8fU9bRVO5OuqjbEeiC1vihbLxrNgnR0k0K/mRmSw=,tag:6x2XELOlJ9JWeOuVBBHNpg==,type:str] sops: kms: [] gcp_kms: [] @@ -24,8 +24,8 @@ sops: WHZSeVJIaGRldmhmcWZvT3YzL3hPbFEKVUtCU1l/RhFOlwdjE0ejW/Ym+cMVNxIW AdvVcWoilMGTsDJIIlLu7fPbhmGotPvqGjxMC2yEpEgJUt/rsz2vPA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-14T01:48:13Z" - mac: ENC[AES256_GCM,data:kz+8dAnj4cDb/XOU3s1MvSk8W3vRI8vXm7hVVine+Lm4hQg9opZ4Z2w0J4zmLlb23NcRoB06E5bGj2+CmacgptBbz6MlEqw8G8VhR+9oKXZV1fwFHa9YZI9Vxj3tLZC68NrM6FORLD/BLK7geDn5oB1Mfl3zX/AkuixxOJSTXKA=,iv:xEsPexTskougBBFh/9dAW45QKdBGD08g162Tyqnz9LI=,tag:AYqVBq7OajFA1LaOI5MP4w==,type:str] + lastmodified: "2025-02-14T03:37:09Z" + mac: ENC[AES256_GCM,data:KViPAUWWpE5UTZOp55f3QeXhHkXBvyl9Np/Tlj5bY7t3qt1U370OLq1yL87WWbvRWa/K/ZYN2gjN16dgfp5o834VniSJM6dnw+vC76QNaXjCfE2HKozRx6NlHFMflzzV8TXvqzJvuPa43E8DRaBctY2a7aIbJ4DJki1dfmrrO3Y=,iv:vPeMWOWQNZX3t4BoYzpuI74tZJ3rCXwbxmqcRAW5ZXY=,tag:i4ZjIXg0JOj2U2jMwurChw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4