feat: error pages

See coop-cloud/organising#115 (comment).
Minuscule .env tweak
2021-11-14 00:34:57 +01:00 · 2021-10-14 00:44:40 +02:00 · 2021-10-14 00:43:56 +02:00 · 2021-10-12 11:41:56 +02:00 · 2021-10-12 11:41:53 +02:00 · 2021-09-15 13:35:57 +02:00
8 changed files with 48 additions and 16 deletions
--- a/.env.sample
+++ b/.env.sample
@ -8,8 +8,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 # WARN, INFO etc.
 LOG_LEVEL=WARN

-# This is here so later lines can extend the definition; you likely don't wanna
-# edit
+# This is here so later lines can extend it; you likely don't wanna edit
 COMPOSE_FILE="compose.yml"

 #####################################################################
@ -52,6 +51,15 @@ COMPOSE_FILE="compose.yml"
 ## Enable Keycloak
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #KEYCLOAK_MIDDLEWARE_ENABLED=1
+#KEYCLOAK_TFA_SERVICE=traefik-forward-auth_app
+
+#####################################################################
+# Prometheus metrics                                                #
+#####################################################################
+
+## Enable prometheus metrics collection
+## used used by the coop-cloud monitoring stack
+#METRICS_ENABLED=1

 #####################################################################
 # Additional services                                               #
--- a/abra.sh
+++ b/abra.sh
@ -1,3 +1,3 @@
-export TRAEFIK_YML_VERSION=v11
-export FILE_PROVIDER_YML_VERSION=v2
+export TRAEFIK_YML_VERSION=v12
+export FILE_PROVIDER_YML_VERSION=v3
 export ENTRYPOINT_VERSION=v2
--- a/compose.host.yml
+++ b/compose.host.yml
@ -13,6 +13,3 @@ services:
      - target: 443
        published: 443
        mode: host
-      - target: 2222
-        published: 2222
-        mode: host
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@ -8,3 +8,4 @@ services:
        - "traefik.http.routers.traefik.middlewares=keycloak@file"
    environment:
      - KEYCLOAK_MIDDLEWARE_ENABLED
+      - KEYCLOAK_TFA_SERVICE
--- a/compose.yml
+++ b/compose.yml
@ -1,7 +1,9 @@
+---
 version: "3.8"
+
 services:
  app:
-    image: "traefik:v2.4.11"
+    image: "traefik:v2.5.2"
    # 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
@ -45,10 +47,29 @@ services:
        - "traefik.http.routers.traefik.tls.options=default@file"
        - "traefik.http.routers.traefik.service=api@internal"
        - "traefik.http.routers.traefik.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.app.version=v2.4.9-be23e1f6"
+        - "coop-cloud.${STACK_NAME}.version=1.0.0+v2.5.2"
+
+  web:
+    image: tarampampam/error-pages:2.2.0
+    environment:
+      - TEMPLATE_NAME=shuffle
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.error-pages-service.loadbalancer.server.port=8080"
+      - "traefik.http.routers.error-router.entrypoints=web-secure"
+      - "traefik.http.routers.error-router.rule=HostRegexp(`{host:.+}`)"
+      - "traefik.http.routers.error-router.priority=10"
+      - "traefik.http.routers.error-router.middlewares=error-pages-middleware@docker"
+      - "traefik.http.middlewares.error-pages-middleware.errors.status=400-599"
+      - "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service@docker"
+      - "traefik.http.middlewares.error-pages-middleware.errors.query=/{status}.html"
+
 networks:
  proxy:
    external: true
+
 configs:
  traefik_yml:
    name: ${STACK_NAME}_traefik_yml_${TRAEFIK_YML_VERSION}
@ -62,5 +83,6 @@ configs:
    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
    file: entrypoint.sh.tmpl
    template_driver: golang
+
 volumes:
  letsencrypt:
--- a/file-provider.yml.tmpl
+++ b/file-provider.yml.tmpl
@ -4,7 +4,7 @@ http:
    {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
    keycloak:
      forwardAuth:
-        address: "http://traefik-forward-auth:4181"
+        address: "http://{{ env "KEYCLOAK_TFA_SERVICE" }}:4181"
        trustForwardHeader: true
        authResponseHeaders:
          - X-Forwarded-User
--- a/renovate.json
+++ b/renovate.json
@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}
--- a/traefik.yml.tmpl
+++ b/traefik.yml.tmpl
@ -54,10 +54,20 @@ entrypoints:
  mumble-udp:
    address: ":64738/udp"
  {{ end }}
+  {{ if eq (env "METRICS_ENABLED") "1" }}
+  metrics:
+    address: ":8082"
+  {{ end }}

 ping:
  entryPoint: web

+{{ if eq (env "METRICS_ENABLED") "1" }}
+metrics:
+  prometheus:
+    entryPoint: metrics
+{{ end }}
+
 certificatesResolvers:
  staging:
    acme:
Author	SHA1	Message	Date
decentral1se	b538fa1509	feat: error pages See coop-cloud/organising#115 (comment).	2021-11-14 00:34:57 +01:00
3wc	8e91a5a3ee	Minuscule .env tweak Some checks failed continuous-integration/drone/push Build is failing Details	2021-10-14 00:44:40 +02:00
decentral1se	3048d09cd8	fix: support configurable tfa service Some checks failed continuous-integration/drone/push Build is failing Details	2021-10-14 00:43:56 +02:00
decentral1se	2c9e980809	chore: remove old file Some checks failed continuous-integration/drone/push Build is failing Details	2021-10-12 11:41:56 +02:00
decentral1se	ec47f5c9dd	chore: first release	2021-10-12 11:41:53 +02:00
decentral1se	cf81dc543a	chore: upgrade to 2.5.2 and add spaces Some checks failed continuous-integration/drone/push Build is failing Details	2021-09-15 13:35:57 +02:00
decentral1se	48f03d8fcf	Remove 2222 port from host networking Some checks failed continuous-integration/drone/push Build is failing Details This was an old config for when we did host mode networking for gitea ssh but now we use the SNI thing that seems to work.	2021-09-02 09:15:58 +02:00
decentral1se	8c6fe61e60	Merge pull request 'Allow prometheus metrics collection' (#28 ) from mirsal/traefik:prometheus-metrics into master Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #28	2021-08-10 06:19:46 +00:00
mirsal	fc5aa70d27	Allow prometheus metrics collection Some checks failed continuous-integration/drone/pr Build is failing Details This patch adds a METRICS_ENABLED configuration variables which, when switched on, defines a metrics entrypoint and enables the built-in prometheus metrics exporter. This allows the monitoring stack to collect and show traefik metrics	2021-08-09 23:28:15 +00:00
3wordchant	9e123afb07	Merge pull request 'COMPOSE_FILE=$COMPOSE_FILE:`, to combine 'em easier' (#27 ) from rejig-compose-vars into master Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #27	2021-08-07 17:55:05 +00:00