From 37aac118cedf8e8d529ed020c7fb71d1bfabecb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Wed, 27 Nov 2024 12:30:51 +0100 Subject: [PATCH] Remove useless `S3_HOSTNAME` envionment variable `S3_HOSTNAME` is only usedful for path-style buckets where Mastodon will use `/`. However, we use domain-style, and that is exactly what `S3_ALIAS_HOST` is for --- services/fediversity/mastodon.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/fediversity/mastodon.nix b/services/fediversity/mastodon.nix index 8cd7454..f93fd2b 100644 --- a/services/fediversity/mastodon.nix +++ b/services/fediversity/mastodon.nix @@ -46,9 +46,7 @@ lib.mkIf (config.fediversity.enable && config.fediversity.mastodon.enable) { AWS_ACCESS_KEY_ID = snakeoil_key.id; AWS_SECRET_ACCESS_KEY = snakeoil_key.secret; S3_PROTOCOL = "http"; - S3_HOSTNAME = config.fediversity.internal.garage.web.rootDomain; - # by default it tries to use "/" - S3_ALIAS_HOST = "${S3_BUCKET}.${S3_HOSTNAME}"; + S3_ALIAS_HOST = "${S3_BUCKET}.${config.fediversity.internal.garage.web.rootDomain}"; # SEE: the last section in https://docs.joinmastodon.org/admin/optional/object-storage/ # TODO: can we set up ACLs with garage? S3_PERMISSION = "";