From b770a1143f1948404068638a352e27075fa9e1b5 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 28 Mar 2024 13:03:04 +0100 Subject: [PATCH] (run) Fix traefik middleware configuration --- run/install/docker-compose-barebones-1.yml.template | 6 ++---- run/install/docker-compose-barebones-2.yml.template | 6 ++---- run/install/docker-compose-marginalia.yml.template | 12 ++++-------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/run/install/docker-compose-barebones-1.yml.template b/run/install/docker-compose-barebones-1.yml.template index 27a13a0a..e4c71a6b 100644 --- a/run/install/docker-compose-barebones-1.yml.template +++ b/run/install/docker-compose-barebones-1.yml.template @@ -50,8 +50,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.search-service.rule=PathPrefix(`/`)" - "traefik.http.routers.search-service.entrypoints=search" - - "traefik.http.routers.search-service.middlewares=add-xpublic" - - "traefik.http.routers.search-service.middlewares=add-public" + - "traefik.http.routers.search-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" control-service: @@ -67,8 +66,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.control-service.rule=PathPrefix(`/`)" - "traefik.http.routers.control-service.entrypoints=control" - - "traefik.http.routers.control-service.middlewares=add-xpublic" - - "traefik.http.routers.control-service.middlewares=add-public" + - "traefik.http.routers.control-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" mariadb: diff --git a/run/install/docker-compose-barebones-2.yml.template b/run/install/docker-compose-barebones-2.yml.template index b47d5b00..ab9d0a08 100644 --- a/run/install/docker-compose-barebones-2.yml.template +++ b/run/install/docker-compose-barebones-2.yml.template @@ -78,8 +78,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.search-service.rule=PathPrefix(`/`)" - "traefik.http.routers.search-service.entrypoints=search" - - "traefik.http.routers.search-service.middlewares=add-xpublic" - - "traefik.http.routers.search-service.middlewares=add-public" + - "traefik.http.routers.search-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" control-service: @@ -95,8 +94,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.control-service.rule=PathPrefix(`/`)" - "traefik.http.routers.control-service.entrypoints=control" - - "traefik.http.routers.control-service.middlewares=add-xpublic" - - "traefik.http.routers.control-service.middlewares=add-public" + - "traefik.http.routers.control-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" mariadb: diff --git a/run/install/docker-compose-marginalia.yml.template b/run/install/docker-compose-marginalia.yml.template index b92543e7..b8eb89c0 100644 --- a/run/install/docker-compose-marginalia.yml.template +++ b/run/install/docker-compose-marginalia.yml.template @@ -82,8 +82,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.search-service.rule=PathPrefix(`/`)" - "traefik.http.routers.search-service.entrypoints=search" - - "traefik.http.routers.search-service.middlewares=add-xpublic" - - "traefik.http.routers.search-service.middlewares=add-public" + - "traefik.http.routers.search-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" assistant-service: @@ -100,8 +99,7 @@ services: - "traefik.http.routers.assistant-service-screenshot.middlewares=add-public" - "traefik.http.routers.assistant-service-suggest.rule=PathPrefix(`/suggest`)" - "traefik.http.routers.assistant-service-suggest.entrypoints=search" - - "traefik.http.routers.assistant-service-suggest.middlewares=add-xpublic" - - "traefik.http.routers.assistant-service-suggest.middlewares=add-public" + - "traefik.http.routers.assistant-service-suggest.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" api-service: @@ -114,8 +112,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.api-service.rule=PathPrefix(`/`)" - "traefik.http.routers.api-service.entrypoints=api" - - "traefik.http.routers.api-service.middlewares=add-xpublic" - - "traefik.http.routers.api-service.middlewares=add-public" + - "traefik.http.routers.api-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" control-service: @@ -131,8 +128,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.control-service.rule=PathPrefix(`/`)" - "traefik.http.routers.control-service.entrypoints=control" - - "traefik.http.routers.control-service.middlewares=add-xpublic" - - "traefik.http.routers.control-service.middlewares=add-public" + - "traefik.http.routers.control-service.middlewares=add-xpublic,add-public" - "traefik.http.middlewares.add-xpublic.headers.customrequestheaders.X-Public=1" - "traefik.http.middlewares.add-public.addprefix.prefix=/public" mariadb: