From 4366dde71a679cb4499decad7dc4d19a092987db Mon Sep 17 00:00:00 2001 From: hpl Date: Fri, 16 Aug 2024 23:36:05 +0200 Subject: [PATCH] change test-adminipwhitelist par test-adminipallowlist --- dockers/apikaz/docker-compose.yml | 2 +- dockers/collabora/docker-compose.yml | 2 +- dockers/etherpad/docker-compose.yml | 2 +- dockers/framadate/docker-compose.yml | 2 +- dockers/grafana/docker-compose.yml | 4 ++-- dockers/jirafeau/docker-compose.yml | 2 +- dockers/traefik/{ => conf}/allow_ip.yml.sample | 2 -- 7 files changed, 7 insertions(+), 9 deletions(-) rename dockers/traefik/{ => conf}/allow_ip.yml.sample (81%) diff --git a/dockers/apikaz/docker-compose.yml b/dockers/apikaz/docker-compose.yml index 7b8437d..7795600 100644 --- a/dockers/apikaz/docker-compose.yml +++ b/dockers/apikaz/docker-compose.yml @@ -32,7 +32,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.${apikazServName}.rule=Host(`${apikazHost}.${domain}`)" - - "traefik.http.routers.${apikazServName}.middlewares=test-adminipwhitelist@file" + - "traefik.http.routers.${apikazServName}.middlewares=test-adminipallowlist@file" - "traefik.docker.network=apikazNet" #volumes: diff --git a/dockers/collabora/docker-compose.yml b/dockers/collabora/docker-compose.yml index 8a040e9..824b347 100644 --- a/dockers/collabora/docker-compose.yml +++ b/dockers/collabora/docker-compose.yml @@ -31,7 +31,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.${officeServName}-admin.rule=Host(`${site}-${officeHost}.${domain}`) && PathPrefix(`/(c|l)ool/adminws`)" - - "traefik.http.routers.${officeServName}-admin.middlewares=test-adminipwhitelist@file" + - "traefik.http.routers.${officeServName}-admin.middlewares=test-adminipallowlist@file" - "traefik.http.routers.${officeServName}.rule=Host(`${site}-${officeHost}.${domain}`) && ! PathPrefix(`/(c|l)ool/adminws`)" networks: diff --git a/dockers/etherpad/docker-compose.yml b/dockers/etherpad/docker-compose.yml index 4d81684..5bb221f 100644 --- a/dockers/etherpad/docker-compose.yml +++ b/dockers/etherpad/docker-compose.yml @@ -26,7 +26,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.pad-admin.rule=Host(`${padHost}.${domain}`) && PathPrefix(`/admin`)" - - "traefik.http.routers.pad-admin.middlewares=test-adminipwhitelist@file" + - "traefik.http.routers.pad-admin.middlewares=test-adminipallowlist@file" - "traefik.http.routers.pad.rule=Host(`${padHost}.${domain}`)" - "traefik.docker.network=etherpadNet" diff --git a/dockers/framadate/docker-compose.yml b/dockers/framadate/docker-compose.yml index d557ba8..cefd2a3 100644 --- a/dockers/framadate/docker-compose.yml +++ b/dockers/framadate/docker-compose.yml @@ -25,7 +25,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.${framadateServName}-admin.rule=Host(`${dateHost}.${domain}`) && PathPrefix(`/admin`)" - - "traefik.http.routers.${framadateServName}-admin.middlewares=test-adminipwhitelist@file" + - "traefik.http.routers.${framadateServName}-admin.middlewares=test-adminipallowlist@file" - "traefik.http.routers.${framadateServName}.rule=Host(`${dateHost}.${domain}`)" - "traefik.docker.network=framadateNet" diff --git a/dockers/grafana/docker-compose.yml b/dockers/grafana/docker-compose.yml index 57919e9..156d100 100644 --- a/dockers/grafana/docker-compose.yml +++ b/dockers/grafana/docker-compose.yml @@ -26,7 +26,7 @@ services: - "traefik.http.middlewares.prometheus-stripprefix.stripprefix.prefixes=/prometheus" - "traefik.http.routers.prometheus-secure.rule=Host(`${site}.${domain}`) && PathPrefix(`/prometheus`)" # - "traefik.http.routers.prometheus-secure.tls=true" - - "traefik.http.routers.prometheus-secure.middlewares=prometheus-stripprefix,test-adminipwhitelist@file,traefik-auth" + - "traefik.http.routers.prometheus-secure.middlewares=prometheus-stripprefix,test-adminiallowlist@file,traefik-auth" - "traefik.http.routers.prometheus-secure.service=prometheus" - "traefik.http.services.prometheus.loadbalancer.server.port=9090" - "traefik.docker.network=traefikNet" @@ -53,7 +53,7 @@ services: - "traefik.http.routers.grafana-secure.rule=Host(`${site}.${domain}`) && PathPrefix(`/grafana`)" # - "traefik.http.routers.grafana-secure.tls=true" - "traefik.http.routers.grafana-secure.service=grafana" - - "traefik.http.routers.grafana-secure.middlewares=grafana-stripprefix,test-adminipwhitelist@file,traefik-auth" + - "traefik.http.routers.grafana-secure.middlewares=grafana-stripprefix,test-adminipallowlist@file,traefik-auth" - "traefik.http.services.grafana.loadbalancer.server.port=3000" - "traefik.docker.network=traefikNet" diff --git a/dockers/jirafeau/docker-compose.yml b/dockers/jirafeau/docker-compose.yml index db5e7f7..cb8bd73 100644 --- a/dockers/jirafeau/docker-compose.yml +++ b/dockers/jirafeau/docker-compose.yml @@ -27,7 +27,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.${jirafeauServName}-admin.rule=Host(`${fileHost}.${domain}`) && PathPrefix(`/admin.php`)" - - "traefik.http.routers.${jirafeauServName}-admin.middlewares=test-adminipwhitelist@file" + - "traefik.http.routers.${jirafeauServName}-admin.middlewares=test-adminipallowlist@file" - "traefik.http.routers.${jirafeauServName}.rule=Host(`${fileHost}.${domain}`) && ! PathPrefix(`/admin.php`)" - "traefik.docker.network=jirafeauNet" diff --git a/dockers/traefik/allow_ip.yml.sample b/dockers/traefik/conf/allow_ip.yml.sample similarity index 81% rename from dockers/traefik/allow_ip.yml.sample rename to dockers/traefik/conf/allow_ip.yml.sample index cf0fa44..7d7f5bc 100644 --- a/dockers/traefik/allow_ip.yml.sample +++ b/dockers/traefik/conf/allow_ip.yml.sample @@ -1,5 +1,3 @@ -#garnir le fichier (enlever le 0.0.0.0/0 pour admin par exemple) et le placer -#dans /conf http: middlewares: ipwhitelist: