feat: error pages

See coop-cloud/organising#115 (comment).
2021-11-14 00:12:22 +01:00
4 changed files with 8 additions and 48 deletions
--- a/404.html
+++ b/404.html
@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title></title>
-  </head>
-  <body>
-    <h1>Co-op Cloud, 404 Hello World!</h1>
-  </body>
-</html>
--- a/abra.sh
+++ b/abra.sh
@ -1,5 +1,3 @@
 export TRAEFIK_YML_VERSION=v12
 export FILE_PROVIDER_YML_VERSION=v3
 export ENTRYPOINT_VERSION=v2
-export NGINX_CONFIG_VERSION=v1
-export GLOBAL_404_VERSION=v1
--- a/compose.yml
+++ b/compose.yml
@ -50,23 +50,20 @@ services:
        - "coop-cloud.${STACK_NAME}.version=1.0.0+v2.5.2"

  web:
-    image: nginx:1.20.0
+    image: tarampampam/error-pages:2.2.0
+    environment:
+      - TEMPLATE_NAME=shuffle
    networks:
      - proxy
-    configs:
-      - source: global_404
-        target: /usr/share/nginx/error-pages/404.html
-      - source: nginx_config
-        target: /etc/nginx/nginx.conf
    labels:
      - "traefik.enable=true"
-      - "traefik.http.services.error-pages-service.loadbalancer.server.port=80"
+      - "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.entrypoints=web"
      - "traefik.http.routers.error-route.priority=1"
-      - "traefik.http.routers.error-router.middlewares=error-pages-middleware"
-      - "traefik.http.middlewares.error-pages-middleware.errors.status=404"
-      - "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service"
+      - "traefik.http.routers.error-router.middlewares=error-pages-middleware@docker"
+      - "traefik.http.middlewares.error-pages-middleware.errors.status=404-599"
+      - "traefik.http.middlewares.error-pages-middleware.errors.service=error-pages-service@docker"
      - "traefik.http.middlewares.error-pages-middleware.errors.query=/{status}.html"

 networks:
@ -86,13 +83,6 @@ configs:
    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
    file: entrypoint.sh.tmpl
    template_driver: golang
-  nginx_config:
-    name: ${STACK_NAME}_nginx_config_${NGINX_CONFIG_VERSION}
-    file: nginx.conf.tmpl
-    template_driver: golang
-  global_404:
-    name: ${STACK_NAME}_global_404_${GLOBAL_404_VERSION}
-    file: 404.html

 volumes:
  letsencrypt:
--- a/nginx.conf.tmpl
+++ b/nginx.conf.tmpl
@ -1,17 +0,0 @@
-user www-data;
-
-events {
-  worker_connections 768;
-}
-
-http {
-  listen       80;
-  server_name  localhost;
-
-  error_page  404    /404.html;
-
-  location / {
-      root  /usr/share/nginx/error-pages;
-      internal;
-  }
-}