chore: sort, formatting, comments drop

compose.yml

@@ -2,19 +2,17 @@
 version: "3.8"
 
 x-environment: &default-env
-  - SNIKKET_DOMAIN=${DOMAIN}
   - SNIKKET_ADMIN_EMAIL
   - SNIKKET_CERTFILE=/certs/$DOMAIN/certificate.crt
+  - SNIKKET_DOMAIN=${DOMAIN}
   - SNIKKET_KEYFILE=/certs/$DOMAIN/privatekey.key
-  - SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_HOST=${STACK_NAME}_portal
   - SNIKKET_TWEAK_INTERNAL_HTTP_HOST=${STACK_NAME}_server
-  - SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE=0.0.0.0
   - SNIKKET_TWEAK_INTERNAL_HTTP_INTERFACE=0.0.0.0
-  - SNIKKET_WEB_PROSODY_ENDPOINT=http://${STACK_NAME}_server:5280
-
-  # https://github.com/snikket-im/snikket-server/blob/master/docs/advanced/firewall.md#how-many-ports-does-the-turn-service-need
-  - SNIKKET_TWEAK_TURNSERVER_MIN_PORT=49152
+  - SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_HOST=${STACK_NAME}_portal
+  - SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE=0.0.0.0
   - SNIKKET_TWEAK_TURNSERVER_MAX_PORT=49153
+  - SNIKKET_TWEAK_TURNSERVER_MIN_PORT=49152
+  - SNIKKET_WEB_PROSODY_ENDPOINT=http://${STACK_NAME}_server:5280
 
 services:
   app:
@@ -31,26 +29,14 @@ services:
     deploy:
       labels:
         - "traefik.enable=true"
-        - "traefik.docker.network=proxy"
         - "traefik.http.routers.${STACK_NAME}.tls=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`, `groups.${DOMAIN}`, `share.${DOMAIN}`${EXTRA_DOMAINS})"
-        # 3wc: this rule works for routing, but not for generating certificates
-        # see https://git.autonomic.zone/coop-cloud/planning/issues/14
-        #- "traefik.http.routers.${STACK_NAME}.rule=HostRegexp(`{subdomain:.+}.${DOMAIN}`, `${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=groups.${DOMAIN},share.${DOMAIN}"
 
-  # snikket_certs:
-  #   image: snikket/snikket-cert-manager:beta
-  #   environment: *default-env
-  #   volumes:
-  #     - snikket_data:/snikket
-  #   networks:
-  #     - backend
-
   portal:
     image: snikket/snikket-web-portal:beta
     environment: *default-env
@@ -121,18 +107,10 @@ services:
       && traefik-certs-dumper file --watch --source /traefik/production-acme.json
       --dest /output --domain-subdir=true --version v2'
     environment:
-      # Make sure this is the same as the main=-domain in traefik.toml
-      - DOMAIN=$DOMAIN
+      - DOMAIN=${DOMAIN}
     volumes:
-      # Folder, which contains the acme.json
       - "traefik_letsencrypt:/traefik"
-      # Folder, where cert.pem and key.pem will be written
       - "certs:/output"
-    # Doesn't work anyway :/
-    # configs:
-    #   - source: certdumper_post
-    #     target: /usr/bin/certdumper_post.sh
-    #     mode: 0555
 
 volumes:
   snikket_data: