diff --git a/apps/mastodon/4.3.6/data.yml b/apps/mastodon/4.3.6/data.yml index f61c3aba5..dd28335bb 100644 --- a/apps/mastodon/4.3.6/data.yml +++ b/apps/mastodon/4.3.6/data.yml @@ -72,6 +72,20 @@ additionalProperties: labelEn: Database encryption primary key required: true type: text + - default: "" + edit: true + envKey: SECRET_KEY_BASE + labelZh: 密钥 + labelEn: Secret key + required: true + type: text + - default: "" + edit: true + envKey: OTP_SECRET + labelZh: OTP 密钥 + labelEn: OTP secret + required: true + type: text - default: "127.0.0.1" edit: true envKey: DB_HOST diff --git a/apps/mastodon/4.3.6/docker-compose.yml b/apps/mastodon/4.3.6/docker-compose.yml index 7c637eb12..89c4d4142 100644 --- a/apps/mastodon/4.3.6/docker-compose.yml +++ b/apps/mastodon/4.3.6/docker-compose.yml @@ -22,8 +22,6 @@ services: - ${MASTODON_ROOT_PATH}/system:/mastodon/public/system environment: - TZ=Asia/Shanghai - healthcheck: - test: [ 'CMD-SHELL',"curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1" ] streaming-mastodon: image: ghcr.io/mastodon/mastodon-streaming:v4.3.6 @@ -40,8 +38,6 @@ services: - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai - healthcheck: - test: [ 'CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1" ] sidekiq-mastodon: image: ghcr.io/mastodon/mastodon:v4.3.6 @@ -58,5 +54,3 @@ services: - ${MASTODON_ROOT_PATH}/system:/mastodon/public/system environment: - TZ=Asia/Shanghai - healthcheck: - test: [ 'CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false" ]