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

2
.env.sample
View File

@ -176,4 +176,4 @@ DEFAULT_LOCALE=en
# Hidden services (Not Supported) # Hidden services (Not Supported)
# =============================== # ===============================
# http_proxy= # http_proxy=
# ALLOW_ACCESS_TO_HIDDEN_SERVICE= # ALLOW_ACCESS_TO_HIDDEN_SERVICE=

70
compose.yml
View File

@ -10,7 +10,7 @@ services:
test: ["CMD", "pg_isready", "-U", "postgres"] test: ["CMD", "pg_isready", "-U", "postgres"]
volumes: volumes:
- postgres:/var/lib/postgresql/data - postgres:/var/lib/postgresql/data
environment: environment:
- POSTGRES_PASSWORD=${DB_PASS} - POSTGRES_PASSWORD=${DB_PASS}
- POSTGRES_USER=${DB_USER} - POSTGRES_USER=${DB_USER}
- POSTGRES_DB=${DB_NAME} - POSTGRES_DB=${DB_NAME}
@ -23,24 +23,24 @@ services:
volumes: volumes:
- redis:/data - redis:/data
# es: # es:
# restart: always # restart: always
# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10 # image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
# environment: # environment:
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" # - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
# - "cluster.name=es-mastodon" # - "cluster.name=es-mastodon"
# - "discovery.type=single-node" # - "discovery.type=single-node"
# - "bootstrap.memory_lock=true" # - "bootstrap.memory_lock=true"
# networks: # networks:
# - internal_network # - internal_network
# healthcheck: # healthcheck:
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] # test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
# volumes: # volumes:
# - ./elasticsearch:/usr/share/elasticsearch/data # - ./elasticsearch:/usr/share/elasticsearch/data
# ulimits: # ulimits:
# memlock: # memlock:
# soft: -1 # soft: -1
# hard: -1 # hard: -1
web: web:
image: &image decentral1se/hometown:v1.0.5_3.4.0 image: &image decentral1se/hometown:v1.0.5_3.4.0
@ -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
@ -63,16 +67,12 @@ services:
# WEB_DOMAIN redirect # WEB_DOMAIN redirect
#- "traefik.http.routers.${STACK_NAME}_web.rule=(Host(`${DOMAIN}`) || (Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/webfinger`)))" #- "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.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.permanent=true"
# - "traefik.http.middlewares.mastodon-webfinger.redirectregex.replacement=https://${WEB_DOMAIN}/.well-known/webfinger" # - "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.rule=(Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/`))"
# - "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,25 +190,19 @@ 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
sidekiq: sidekiq:
image: *image image: *image
command: bundle exec sidekiq command: bundle exec sidekiq
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
# secrets: # secrets:
# secret_key_base: # secret_key_base:
# name: ${STACK_NAME}_secret_key_base_${SECRET_DB_PASSWORD_VERSION} # name: ${STACK_NAME}_secret_key_base_${SECRET_DB_PASSWORD_VERSION}