From 95c35ed3049204d5adff88d2b895f57b9a2dca46 Mon Sep 17 00:00:00 2001 From: Alexandra Catalina Date: Thu, 29 Feb 2024 08:14:17 -0800 Subject: [PATCH] [bitnami/mastodon]: support AUTHORIZED_FETCH and LIMITED_FEDERATION_MODE variables (#60775) [bitnami/mastodon]: add AUTHORIZED_FETCH and LIMITED_FEDERATION_MODE prefixed as `MASTODON_AUTHORIZED_FETCH` and `MASTODON_LIMTIED_FEDERATION_MODE` Signed-off-by: alexandra catalina --- .../rootfs/opt/bitnami/scripts/mastodon-env.sh | 12 ++++++++++++ bitnami/mastodon/README.md | 2 ++ 2 files changed, 14 insertions(+) diff --git a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh index b557e03ce006..161351951057 100644 --- a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh +++ b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh @@ -101,6 +101,10 @@ mastodon_env_vars=( AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID S3_ENDPOINT + MASTODON_AUTHORIZED_FETCH + MASTODON_LIMITED_FEDERATION_MODE + AUTHORIZED_FETCH + LIMITED_FEDERATION_MODE ) for env_var in "${mastodon_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -167,6 +171,14 @@ export BIND="$MASTODON_BIND_ADDRESS" export MASTODON_CFG_BIND="$MASTODON_BIND_ADDRESS" export MASTODON_DATA_TO_PERSIST="${MASTODON_DATA_TO_PERSIST:-$MASTODON_ASSETS_DIR $MASTODON_SYSTEM_DIR}" +MASTODON_AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH:-"${AUTHORIZED_FETCH:-false}"}" +export MASTODON_AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH}" +export AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH}" + +MASTODON_LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE="${LIMITED_FEDERATION_MODE:-false}"}" +export MASTODON_LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE}" +export LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE}" + # Database configuration export MASTODON_MIGRATE_DATABASE="${MASTODON_MIGRATE_DATABASE:-true}" MASTODON_DATABASE_HOST="${MASTODON_DATABASE_HOST:-"${DB_HOST:-}"}" diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index 962541667fb5..3575bdf601a0 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -104,6 +104,8 @@ docker-compose up mastodon |--------------------------------------|-------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------| | `MASTODON_MODE` | Mastodon service to run (can be web, streaming or sidekiq). | `web` | | `ALLOW_EMPTY_PASSWORD` | Allow an empty password. | `no` | +| `MASTODON_AUTHORIZED_FETCH` | Use ['secure mode'](https://docs.joinmastodon.org/admin/config/#authorized_fetch). | `false` | +| `MASTODON_LIMITED_FEDERATION_MODE` | Use an allow-list for federating with other servers. | `false` | | `MASTODON_CREATE_ADMIN` | Create admin for Mastodon. | `true` | | `MASTODON_ADMIN_USERNAME` | Mastodon admin username. | `user` | | `MASTODON_ADMIN_PASSWORD` | Mastodon admin password. | `bitnami1` |