Merge branch 'main' of ssh://git.autonomic.zone:2222/coop-cloud/mastodon into main
This commit is contained in:
decentral1se
commit
12eb79003b
GPG Key ID:
92DAD76BD9567B8A
|
|
@ -176,4 +176,4 @@ DEFAULT_LOCALE=en
|
|||
# Hidden services (Not Supported)
|
||||
# ===============================
|
||||
# http_proxy=
|
||||
# ALLOW_ACCESS_TO_HIDDEN_SERVICE=
|
||||
# ALLOW_ACCESS_TO_HIDDEN_SERVICE=
|
||||
|
|
|
|||
70
compose.yml
70
compose.yml
|
|
@ -10,7 +10,7 @@ services:
|
|||
test: ["CMD", "pg_isready", "-U", "postgres"]
|
||||
volumes:
|
||||
- postgres:/var/lib/postgresql/data
|
||||
environment:
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=${DB_PASS}
|
||||
- POSTGRES_USER=${DB_USER}
|
||||
- POSTGRES_DB=${DB_NAME}
|
||||
|
|
@ -23,24 +23,24 @@ services:
|
|||
volumes:
|
||||
- redis:/data
|
||||
|
||||
# es:
|
||||
# restart: always
|
||||
# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
|
||||
# environment:
|
||||
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
||||
# - "cluster.name=es-mastodon"
|
||||
# - "discovery.type=single-node"
|
||||
# - "bootstrap.memory_lock=true"
|
||||
# networks:
|
||||
# - internal_network
|
||||
# healthcheck:
|
||||
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
|
||||
# volumes:
|
||||
# - ./elasticsearch:/usr/share/elasticsearch/data
|
||||
# ulimits:
|
||||
# memlock:
|
||||
# soft: -1
|
||||
# hard: -1
|
||||
# es:
|
||||
# restart: always
|
||||
# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
|
||||
# environment:
|
||||
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
||||
# - "cluster.name=es-mastodon"
|
||||
# - "discovery.type=single-node"
|
||||
# - "bootstrap.memory_lock=true"
|
||||
# networks:
|
||||
# - internal_network
|
||||
# healthcheck:
|
||||
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
|
||||
# volumes:
|
||||
# - ./elasticsearch:/usr/share/elasticsearch/data
|
||||
# ulimits:
|
||||
# memlock:
|
||||
# soft: -1
|
||||
# hard: -1
|
||||
|
||||
web:
|
||||
image: &image decentral1se/hometown:v1.0.5_3.4.0
|
||||
|
|
@ -49,7 +49,11 @@ services:
|
|||
- proxy
|
||||
- internal_network
|
||||
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:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
|
|
@ -63,16 +67,12 @@ services:
|
|||
# WEB_DOMAIN redirect
|
||||
#- "traefik.http.routers.${STACK_NAME}_web.rule=(Host(`${DOMAIN}`) || (Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/webfinger`)))"
|
||||
# - "traefik.http.middlewares.mastodon-webfinger.redirectregex.regex=^https?://${LOCAL_DOMAIN}/.*" #^(http|https)://${LOCAL_DOMAIN}/.well-known/webfinger"
|
||||
# # - "traefik.http.middlewares.mastodon-webfinger.redirectregex.permanent=true"
|
||||
# - "traefik.http.middlewares.mastodon-webfinger.redirectregex.replacement=https://${WEB_DOMAIN}/.well-known/webfinger"
|
||||
# # - "traefik.http.middlewares.mastodon-webfinger.redirectregex.permanent=true"
|
||||
# - "traefik.http.middlewares.mastodon-webfinger.redirectregex.replacement=https://${WEB_DOMAIN}/.well-known/webfinger"
|
||||
# - "traefik.http.routers.${STACK_NAME}_hack.rule=(Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/`))"
|
||||
# - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure"
|
||||
# - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker"
|
||||
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
# - es
|
||||
volumes: &appVolume
|
||||
- app:/mastodon
|
||||
# secrets: &secrets
|
||||
|
|
@ -86,7 +86,7 @@ services:
|
|||
- DB_PORT
|
||||
- REDIS_HOST
|
||||
- REDIS_PORT
|
||||
- REDIS_URL=
|
||||
- REDIS_URL
|
||||
- REDIS_NAMESPACE
|
||||
- CACHE_REDIS_HOST
|
||||
- CACHE_REDIS_PORT
|
||||
|
|
@ -170,7 +170,11 @@ services:
|
|||
command: node ./streaming
|
||||
networks: *bothNetworks
|
||||
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:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
|
|
@ -186,25 +190,19 @@ services:
|
|||
#- "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.SSLHost=${DOMAIN}"
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
environment: *env
|
||||
volumes: *appVolume # used to make sure this volume is created
|
||||
|
||||
|
||||
sidekiq:
|
||||
image: *image
|
||||
command: bundle exec sidekiq
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
networks: *bothNetworks
|
||||
volumes: *appVolume
|
||||
environment: *env
|
||||
|
||||
|
||||
# secrets:
|
||||
# secret_key_base:
|
||||
# name: ${STACK_NAME}_secret_key_base_${SECRET_DB_PASSWORD_VERSION}
|
||||
|
|
|
|||
Reference in New Issue