bump TRAEFIK_YML_VERSION

.env.sample

@@ -1,6 +1,6 @@
 TYPE=traefik
 
-DOMAIN=traefik.example.com
+DOMAIN={{ .Domain }}
 LETS_ENCRYPT_ENV=production
 
 LETS_ENCRYPT_EMAIL=certs@example.com
@@ -15,9 +15,6 @@ COMPOSE_FILE="compose.yml"
 # General settings                                                  #
 #####################################################################
 
-## Error pages
-COMPOSE_FILE="$COMPOSE_FILE:compose.error-pages.yml"
-
 ## Host-mode networking
 #COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
 
@@ -105,3 +102,7 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.error-pages.yml"
 ## Matrix
 #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
 #MATRIX_FEDERATION_ENABLED=1
+
+## Minecraft
+#COMPOSE_FILE="$COMPOSE_FILE:compose.minecraft.yml"
+#MINECRAFT_ENABLED=1

README.md

@@ -21,6 +21,6 @@
 2. `abra app new traefik`
 3. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to
    your Docker swarm box
-4. `abra app deploy YOURAPPDOMAIN`
+4. `abra app YOURAPPDOMAIN deploy`
 
 [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra

abra.sh

@@ -1,3 +1,3 @@
-export TRAEFIK_YML_VERSION=v15
+export TRAEFIK_YML_VERSION=v16
 export FILE_PROVIDER_YML_VERSION=v6
 export ENTRYPOINT_VERSION=v2

compose.error-pages.yml

@@ -1,36 +0,0 @@
-version: '3.8'
-
-services:
-  error-pages:
-    image: tarampampam/error-pages:latest # Using the latest tag is highly discouraged. Please, use tags in X.Y.Z format
-    environment:
-      TEMPLATE_NAME: app-down
-    networks:
-      - proxy
-    deploy:
-      placement:
-        constraints:
-          - node.role == worker
-      labels:
-         - "traefik.enable=true"
-         - "traefik.docker.network=proxy"
-         - # use as "fallback" for any non-registered services (with priority below normal)
-         - "traefik.http.routers.error-pages-router.rule=HostRegexp(`{host:.+}`)"
-         - "traefik.http.routers.error-pages-router.priority=10"
-         - # should say that all of your services work on https
-         - "traefik.http.routers.error-pages-router.tls=true"
-         - "traefik.http.routers.error-pages-router.entrypoints=https"
-         - "traefik.http.routers.error-pages-router.middlewares=error-pages-middleware"
-         - "traefik.http.services.error-pages-service.loadbalancer.server.port=8080"
-         - # "errors" middleware settings
-         - "traefik.http.middlewares.error-pages-middleware.errors.status=400-599"
-         - "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service"
-         - "traefik.http.middlewares.error-pages-middleware.errors.query=/{status}.html"
-
-  app:
-    deploy:
-      labels:
-        # next line is important
-        - "traefik.http.routers.${STACK_NAME}.middlewares=error-pages-middleware"
-        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
-

compose.headless.yml

@@ -10,5 +10,5 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.traefik.loadbalancer.server.port=web"
-        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.routers.traefik.entrypoints=web-secure"
-        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
+        - "traefik.http.routers.traefik.service=api@internal"

compose.minecraft.yml

@@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - MINECRAFT_ENABLED
+    ports:
+      - 25565:25565

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "traefik:v2.9.6"
+    image: "traefik:v2.5.6"
     # Note(decentral1se): *please do not* add any additional ports here.
     # Doing so could break new installs with port conflicts. Please use
     # the usual `compose.$app.yml` approach for any additional ports
@@ -40,14 +40,14 @@ services:
         order: start-first
       labels:
         - "traefik.enable=true"
-        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=web"
+        - "traefik.http.services.traefik.loadbalancer.server.port=web"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.traefik.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.routers.traefik.entrypoints=web-secure"
-        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.traefik.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "traefik.http.routers.${STACK_NAME}.tls.options=default@file"
+        - "traefik.http.routers.traefik.tls.options=default@file"
-        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
+        - "traefik.http.routers.traefik.service=api@internal"
-        - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
+        - "traefik.http.routers.traefik.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.version=2.0.3+v2.9.6"
+        - "coop-cloud.${STACK_NAME}.version=1.0.1+v2.5.6"
 
 networks:
   proxy:

traefik.yml.tmpl

@@ -54,9 +54,9 @@ entrypoints:
   mumble-udp:
     address: ":64738/udp"
   {{ end }}
-  {{ if eq (env "COMPY_ENABLED") "1" }}
+  {{ if eq (env "MINECRAFT_ENABLED") "1" }}
-  compy:
+  minecraft:
-    address: ":9999"
+    address: ":25565"
   {{ end }}
   {{ if eq (env "METRICS_ENABLED") "1" }}
   metrics:
@@ -102,5 +102,5 @@ certificatesResolvers:
         provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
         resolvers:
           - "1.1.1.1:53"
-          - "9.9.9.9:53"
+          - "8.8.8.8:53"
       {{ end }}