diff --git a/bitnami/mastodon/4/debian-12/Dockerfile b/bitnami/mastodon/4/debian-12/Dockerfile index 979a85c130cb..14abbefefb64 100644 --- a/bitnami/mastodon/4/debian-12/Dockerfile +++ b/bitnami/mastodon/4/debian-12/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-02-23T16:23:32Z" \ + org.opencontainers.image.created="2024-02-29T13:06:48Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.2.8-debian-12-r0" \ + org.opencontainers.image.ref.name="4.2.8-debian-12-r1" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.2.8" diff --git a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh index 79fe6cfd9e86..750b3c202444 100644 --- a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh +++ b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh @@ -238,7 +238,7 @@ mastodon_ensure_admin_user_exists() { # We use the tootctl tool to create the admin user # https://github.com/mastodon/mastodon/blob/main/chart/templates/job-create-admin.yaml#L50 local -r cmd=("tootctl") - local -r args=("accounts" "create" "$MASTODON_ADMIN_USERNAME" "--email" "$MASTODON_ADMIN_EMAIL" "--confirmed" "--role" "Owner") + local -r args=("accounts" "create" "$MASTODON_ADMIN_USERNAME" "--email" "$MASTODON_ADMIN_EMAIL" "--approve" "--confirmed" "--role" "Owner") local res="" if am_i_root; then # Adding true to avoid the logic to exit @@ -278,7 +278,7 @@ EOF ######################### mastodon_wait_for_postgresql_connection() { local -r connection_string="${1:?missing connection string}" - info "Waiting for PostgreSQL to be ready at ${connection_string#*@}" + info "Waiting for PostgreSQL to be ready at ${connection_string##*@}" check_postgresql_connection() { local -r psql_args=("$connection_string" "-c" "SELECT 1") local -r res=$(psql "${psql_args[@]}" 2>&1) 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 bf72acd06cb5..b557e03ce006 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 @@ -39,6 +39,8 @@ mastodon_env_vars=( MASTODON_WEB_HOST MASTODON_WEB_PORT_NUMBER MASTODON_STREAMING_PORT_NUMBER + MASTODON_AUTHORIZED_FETCH + MASTODON_LIMITED_FEDERATION_MODE MASTODON_STREAMING_API_BASE_URL RAILS_SERVE_STATIC_FILES MASTODON_BIND_ADDRESS @@ -73,6 +75,8 @@ mastodon_env_vars=( SECRET_KEY_BASE OTP_SECRET WEB_DOMAIN + AUTHORIZED_FETCH + LIMITED_FEDERATION_MODE STREAMING_API_BASE_URL BIND DB_HOST @@ -144,6 +148,14 @@ export MASTODON_CFG_WEB_DOMAIN="$MASTODON_WEB_DOMAIN" export MASTODON_WEB_HOST="${MASTODON_WEB_HOST:-mastodon}" export MASTODON_WEB_PORT_NUMBER="${MASTODON_WEB_PORT_NUMBER:-3000}" export MASTODON_STREAMING_PORT_NUMBER="${MASTODON_STREAMING_PORT_NUMBER:-4000}" +MASTODON_AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH:-"${AUTHORIZED_FETCH:-}"}" +export MASTODON_AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH:-false}" +export AUTHORIZED_FETCH="$MASTODON_AUTHORIZED_FETCH" +export MASTODON_CFG_AUTHORIZED_FETCH="$MASTODON_AUTHORIZED_FETCH" +MASTODON_LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE:-"${LIMITED_FEDERATION_MODE:-}"}" +export MASTODON_LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE:-false}" +export LIMITED_FEDERATION_MODE="$MASTODON_LIMITED_FEDERATION_MODE" +export MASTODON_CFG_LIMITED_FEDERATION_MODE="$MASTODON_LIMITED_FEDERATION_MODE" MASTODON_STREAMING_API_BASE_URL="${MASTODON_STREAMING_API_BASE_URL:-"${STREAMING_API_BASE_URL:-}"}" export MASTODON_STREAMING_API_BASE_URL="${MASTODON_STREAMING_API_BASE_URL:-ws://localhost:${MASTODON_STREAMING_PORT_NUMBER}}" export STREAMING_API_BASE_URL="$MASTODON_STREAMING_API_BASE_URL" diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index 7870826a16d4..962541667fb5 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -117,6 +117,8 @@ docker-compose up mastodon | `MASTODON_WEB_HOST` | Mastodon web host (for the streaming and sidekiq services to access). | `mastodon` | | `MASTODON_WEB_PORT_NUMBER` | Mastodon web port. | `3000` | | `MASTODON_STREAMING_PORT_NUMBER` | Mastodon streaming port. | `4000` | +| `MASTODON_AUTHORIZED_FETCH` | Use secure mode. | `false` | +| `MASTODON_LIMITED_FEDERATION_MODE` | Use an allow-list for federating with other servers. | `false` | | `MASTODON_STREAMING_API_BASE_URL` | Mastodon public api base url. | `ws://localhost:${MASTODON_STREAMING_PORT_NUMBER}` | | `RAILS_SERVE_STATIC_FILES` | Have puma server the static files in the public/ folder | `true` | | `RAILS_SERVE_STATIC_FILES` | Have puma server the static files in the public/ folder | `false` |