Merge branch 'main' of ssh://git.autonomic.zone:2222/coop-cloud/mastodon into main

This commit is contained in:
decentral1se 2021-05-28 12:57:47 +02:00
commit dee312b03d
Signed by: decentral1se
GPG Key ID: 92DAD76BD9567B8A
2 changed files with 1 additions and 2 deletions

View File

@ -14,6 +14,7 @@ This repository is a copy of [coop-cloud/mastodon](https://git.autonomic.zone/co
- **Email**: - **Email**:
- **Tests**: - **Tests**:
- **SSO**: - **SSO**:
<!-- endmetadata --> <!-- endmetadata -->
## Basic usage ## Basic usage

View File

@ -81,7 +81,6 @@ services:
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
configs: &configs configs: &configs
- source: entrypoint_sh - source: entrypoint_sh
target: /usr/local/bin/entrypoint.sh target: /usr/local/bin/entrypoint.sh
@ -112,7 +111,6 @@ services:
- ES_ENABLED - ES_ENABLED
- ES_HOST - ES_HOST
- ES_PORT - ES_PORT
- ES_PREFIX
- STATSD_ADDR - STATSD_ADDR
- STATSD_NAMESPACE - STATSD_NAMESPACE
- VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key - VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key