knoflook/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
decentral1se 2021-05-27 22:14:03 +02:00
commit 12eb79003b
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compose.yml
View File

@ -49,7 +49,11 @@ services:
- proxy - proxy
- internal_network - internal_network
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:3000/health || exit 1"] test:
[
"CMD-SHELL",
"wget -q --spider --proxy=off localhost:3000/health || exit 1",
]
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -69,10 +73,6 @@ services:
# - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure" # - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure"
# - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker" # - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker"
depends_on:
- db
- redis
# - es
volumes: &appVolume volumes: &appVolume
- app:/mastodon - app:/mastodon
# secrets: &secrets # secrets: &secrets
@ -86,7 +86,7 @@ services:
- DB_PORT - DB_PORT
- REDIS_HOST - REDIS_HOST
- REDIS_PORT - REDIS_PORT
- REDIS_URL= - REDIS_URL
- REDIS_NAMESPACE - REDIS_NAMESPACE
- CACHE_REDIS_HOST - CACHE_REDIS_HOST
- CACHE_REDIS_PORT - CACHE_REDIS_PORT
@ -170,7 +170,11 @@ services:
command: node ./streaming command: node ./streaming
networks: *bothNetworks networks: *bothNetworks
healthcheck: healthcheck:
test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1"] test:
[
"CMD-SHELL",
"wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1",
]
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
@ -186,9 +190,6 @@ services:
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
#- "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}"
depends_on:
- db
- redis
environment: *env environment: *env
volumes: *appVolume # used to make sure this volume is created volumes: *appVolume # used to make sure this volume is created
@ -198,9 +199,6 @@ services:
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure
depends_on:
- db
- redis
networks: *bothNetworks networks: *bothNetworks
volumes: *appVolume volumes: *appVolume
environment: *env environment: *env