bump TRAEFIK_YML_VERSION

.drone.yml

@@ -3,12 +3,10 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    image: decentral1se/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: traefik
-      networks:
-       - proxy
       deploy_key:
         from_secret: drone_ssh_swarm_test
     environment:
@@ -24,17 +22,11 @@ trigger:
     - master
 ---
 kind: pipeline
-name: generate recipe catalogue
+name: recipe release
 steps:
   - name: release a new version
-    image: plugins/downstream
+    image: thecoopcloud/drone-abra:latest
     settings:
-      server: https://build.coopcloud.tech
+      command: recipe traefik release
-      token:
+      deploy_key:
-        from_secret: drone_abra-bot_token
+        from_secret: abra_bot_deploy_key
-      fork: true
-      repositories:
-        - coop-cloud/auto-recipes-catalogue-json
-
-trigger:
-  event: tag

.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

@@ -19,29 +19,8 @@
 
 1. Set up Docker Swarm and [`abra`]
 2. `abra app new traefik`
-3. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to
+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`
-
-## Configuring wildcard SSL using DNS
-
-Automatic certificate generation will Just Work™ for most recipes  which use a fixed
-number of subdomains. For some recipes which need to work across arbitrary
-subdomains, like
-[`federatedwiki`](https://git.coopcloud.tech/coop-cloud/federatedwiki/) and
-[`go-ssb-room`](https://git.coopcloud.tech/coop-cloud/federatedwiki/), you'll
-need to give Traefik access to your DNS provider so that it can carry out
-Letsencrypt DNS challenges.
-
-1. Use Gandi or OVH for DNS 🤡 (support for other providers can be easily added,
-   see [the `lego` docs](https://go-acme.github.io/lego/dns/#dns-providers).
-2. Run `abra app config YOURAPPDOMAIN`
-3. Uncomment e.g. `ENABLE_GANDI` and the related `SECRET_.._VERSION` line, e.g.
-   `SECRET_GANDIV5_API_KEY_VERSION`
-4. Generate an API key for your provider
-5. Run `abra app secret insert YOURAPPDOMAIN SECRETNAME v1 SECRETVALUE`, where
-   `SECRETNAME` is from the compose file (e.g. `compose.gandi.yml`) e.g.
-   `gandiv5_api_key` and `SECRETVALUE` is the API key.
-6. Redeploy Traefik, using e.g. `abra app deploy YOURAPPDOMAIN -f`
 
 [`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,31 +0,0 @@
-version: '3.8'
-
-services:
-
-  app:
-    command:
-      - --providers.docker
-      - --experimental.plugins.staticresponse.modulename=github.com/jdel/staticresponse
-      - --experimental.plugins.staticresponse.version=v0.0.1
-    deploy:
-      labels:
-        # custom traefik errors
-        - "traefik.http.middlewares.web-secure.errors.status=400-599"
-        - "traefik.http.middlewares.web-secure.errors.service=down-rule"
-        - "traefik.http.middlewares.web-secure.errors.query=/traefik-http-error/{status}"
-        # catchall rule
-        - "traefik.http.routers.http-catchall.entrypoints=web-secure"
-        - "traefik.http.routers.http-catchall.rule=PathPrefix(`/`)"
-        # lowest possible priority, evaluated when no other router is matched
-        - "traefik.http.routers.http-catchall.priority=1"
-        - "traefik.http.routers.http-catchall.middlewares=503down"
-        # static error message
-        - "traefik.http.middlewares.503down.plugin.staticresponse"
-        - "traefik.http.middlewares.503down.plugin.staticresponse.StatusCode=503"
-        - "traefik.http.middlewares.503down.plugin.staticresponse.Body=Sorry, currently under maintenance. Please try again later."
-        # error page
-        - "traefik.http.routers.down-rule.rule=PathPrefix(`/traefik-http-error`)"
-        - "traefik.http.routers.down-rule.service=noop@internal"
-        - "traefik.http.routers.down-rule.entrypoints=web-secure"
-        - "traefik.http.routers.down-rule.middlewares=503down"
-        

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.9"
+    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,13 +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}.service=api@internal"
+        - "traefik.http.routers.traefik.tls.options=default@file"
-        - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
+        - "traefik.http.routers.traefik.service=api@internal"
-        - "coop-cloud.${STACK_NAME}.version=2.1.0+v2.9.9"
+        - "traefik.http.routers.traefik.middlewares=security@file"
+        - "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 }}