From d0812a22fe53d5679a46289fb3fbf51a03643528 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Thu, 27 May 2021 22:10:40 +0200
Subject: [PATCH] Let the formatter have its way

---
 compose.yml | 60 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/compose.yml b/compose.yml
index 4d3f9ac..e5f4f33 100644
--- a/compose.yml
+++ b/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 tootsuite/mastodon:v3.3.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,8 +67,8 @@ 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"
@@ -72,7 +76,7 @@ services:
     depends_on:
       - db
       - redis
-#      - es
+    #      - es
     volumes: &appVolume
       - app:/mastodon
     # secrets: &secrets
@@ -170,7 +174,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
@@ -191,7 +199,7 @@ services:
       - redis
     environment: *env
     volumes: *appVolume # used to make sure this volume is created
-    
+
   sidekiq:
     image: *image
     command: bundle exec sidekiq
@@ -204,7 +212,7 @@ services:
     networks: *bothNetworks
     volumes: *appVolume
     environment: *env
-    
+
 # secrets:
 #   secret_key_base:
 #     name: ${STACK_NAME}_secret_key_base_${SECRET_DB_PASSWORD_VERSION}