attempt at adding error pages

.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
-      token:
-        from_secret: drone_abra-bot_token
-      fork: true
-      repositories:
-        - coop-cloud/auto-recipes-catalogue-json
-
-trigger:
-  event: tag
+      command: recipe traefik release
+      deploy_key:
+        from_secret: abra_bot_deploy_key

.env.sample

@@ -1,6 +1,4 @@
 TYPE=traefik
-TIMEOUT=300
-ENABLE_AUTO_UPDATE=true
 
 DOMAIN=traefik.example.com
 LETS_ENCRYPT_ENV=production
@@ -17,6 +15,9 @@ 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"
 
@@ -65,12 +66,6 @@ COMPOSE_FILE="compose.yml"
 ## used used by the coop-cloud monitoring stack
 #METRICS_ENABLED=1
 
-#####################################################################
-# File provider directory configuration                             #
-# (Route bare metal and non-docker services on the machine!)        #
-#####################################################################
-#FILE_PROVIDER_DIRECTORY_ENABLED=1
-
 #####################################################################
 # Additional services                                               #
 #####################################################################

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`
 
-## 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=v16
-export FILE_PROVIDER_YML_VERSION=v7
+export TRAEFIK_YML_VERSION=v15
+export FILE_PROVIDER_YML_VERSION=v6
 export ENTRYPOINT_VERSION=v2

compose.error-pages.yml

@@ -0,0 +1,36 @@
+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.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "traefik:v2.10.1"
+    image: "traefik:v2.9.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
@@ -13,7 +13,6 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "letsencrypt:/etc/letsencrypt"
-      - "file-providers:/etc/traefik/file-providers"
     configs:
       - source: traefik_yml
         target: /etc/traefik/traefik.yml
@@ -45,10 +44,10 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.${STACK_NAME}.tls.options=default@file"
         - "traefik.http.routers.${STACK_NAME}.service=api@internal"
         - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.version=2.2.0+v2.10.2"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
+        - "coop-cloud.${STACK_NAME}.version=2.0.3+v2.9.6"
 
 networks:
   proxy:
@@ -70,4 +69,3 @@ configs:
 
 volumes:
   letsencrypt:
-  file-providers:

traefik.yml.tmpl

@@ -8,14 +8,8 @@ providers:
     exposedByDefault: false
     network: proxy
     swarmMode: true
-  {{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }}
-  file:
-    directory: /etc/traefik/file-providers
-    watch: true
-  {{ else }}
   file:
     filename: /etc/traefik/file-provider.yml
-  {{ end }}
 
 api:
   dashboard: {{ env "DASHBOARD_ENABLED" }}