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

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 decentral1se/hometown:v1.0.5_3.4.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"