From 0e026343e80483401ed5aa44a99e887e9c464161 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 26 Dec 2022 01:26:33 +0100 Subject: [PATCH] mastodon: S3 --- secret/hosts/sail.nix | Bin 2059 -> 2359 bytes system/nixos/mastodon.nix | 10 ++++++++++ 2 files changed, 10 insertions(+) diff --git a/secret/hosts/sail.nix b/secret/hosts/sail.nix index 218ea9c03996822574a6bf53f46bcfe647c043ac..2aa80f6f942f8d3fcfd7eb53cb1fe4d01c39bcad 100644 GIT binary patch literal 2359 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 diff --git a/system/nixos/mastodon.nix b/system/nixos/mastodon.nix index e67fb74..96e8916 100644 --- a/system/nixos/mastodon.nix +++ b/system/nixos/mastodon.nix @@ -78,6 +78,16 @@ in ES_USER = secret.mastodon.elasticsearch.user; ES_PASS = secret.mastodon.elasticsearch.password; + + S3_ENABLED = true; + S3_BUCKET = secret.mastodon.s3.bucket; + AWS_ACCESS_KEY_ID = secret.mastodon.s3.accessKeyId; + AWS_SECRET_ACCESS_KEY = secret.mastodon.s3.secretAccessKey; + S3_PROTOCOL = "https"; + S3_REGION = secret.mastodon.s3.region; + S3_ENDPOINT = secret.mastodon.s3.endpoint; + S3_ALIAS_HOST = secret.mastodon.s3.hostname; + S3_HOSTNAME = secret.mastodon.s3.hostname; }; };