From 6e57107884e09f5758e32dd548b26d9058217e2a Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 28 May 2021 13:45:49 +0200 Subject: [PATCH] Unbork indentation again again --- compose.yml | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/compose.yml b/compose.yml index c3a278a..13dbd22 100644 --- a/compose.yml +++ b/compose.yml @@ -26,23 +26,27 @@ services: volumes: - redis:/data - es: - 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: - - es:/usr/share/elasticsearch/data - ulimits: - memlock: - soft: -1 - hard: -1 + es: + 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: + - es:/usr/share/elasticsearch/data + ulimits: + memlock: + soft: -1 + hard: -1 web: image: &image tootsuite/mastodon:v3.3.0 @@ -75,7 +79,6 @@ services: # - "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" - ## Redirect from EXTRA_DOMAINS to DOMAIN #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"