From e7b82d5c5494ac63f03406f136f2039a4ad7ffd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Thu, 5 Sep 2024 13:05:29 +0200 Subject: [PATCH] Proxy Garage backend --- pixelfed-vm.nix | 2 +- pixelfed.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pixelfed-vm.nix b/pixelfed-vm.nix index fe890a8..de88c18 100644 --- a/pixelfed-vm.nix +++ b/pixelfed-vm.nix @@ -14,7 +14,7 @@ # I feel like this should have an `enable` option and be configured via `services.nginx` rather than mirroring those options in services.pixelfed.nginx # TODO: If that indeed makes sense, upstream it. nginx = { - # locations."/storage/".proxyPass = "http://pixelfed.web.garage.localhost:3902/public/"; + locations."/public/".proxyPass = "http://pixelfed.web.garage.localhost:3902/public/"; }; }; virtualisation.memorySize = 2048; diff --git a/pixelfed.nix b/pixelfed.nix index fe51e72..03b6d61 100644 --- a/pixelfed.nix +++ b/pixelfed.nix @@ -42,7 +42,7 @@ in AWS_ACCESS_KEY_ID = snakeoil_key.id; AWS_SECRET_ACCESS_KEY = snakeoil_key.secret; AWS_DEFAULT_REGION = "garage"; - AWS_URL = "http://pixelfed.s3.garage.localhost:3900"; + AWS_URL = ""; ## Empty such that the URL is just relative to the pixelfed instance. AWS_BUCKET = "pixelfed"; AWS_ENDPOINT = "http://s3.garage.localhost:3900"; AWS_USE_PATH_STYLE_ENDPOINT = false;