diff --git a/dockers/jirafeau/docker-compose.yml b/dockers/jirafeau/docker-compose.yml index 0aeabf1..80d5cdd 100644 --- a/dockers/jirafeau/docker-compose.yml +++ b/dockers/jirafeau/docker-compose.yml @@ -23,11 +23,15 @@ services: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro labels: - - "traefik.enable=true" - - "traefik.http.routers.${jirafeauServName}-admin.rule=Host(`${fileHost}.${domain}`) && PathPrefix(`/admin.php`)" - - "traefik.http.routers.${jirafeauServName}-admin.middlewares=test-adminipallowlist@file" - - "traefik.http.routers.${jirafeauServName}.rule=Host(`${fileHost}.${domain}`) && ! PathPrefix(`/admin.php`)" - - "traefik.docker.network=jirafeauNet" + - "traefik.enable=true" + # pour ouvrir juste /f.php !! + # - "traefik.http.routers.${jirafeauServName}-download.rule=Host(`${fileHost}.${domain}`) && ( PathPrefix(`/f.php`) || PathPrefix(`/index.php`)" + # Le service est ouvert aux ip autorisées + # - "traefik.http.routers.${jirafeauServName}-admin.rule=Host(`${fileHost}.${domain}`)" + - "traefik.http.routers.${jirafeauServName}-admin.rule=Host(`${fileHost}.${domain}`) && ( PathPrefix(`/a-send.php`) || PathPrefix(`/s.php`) || PathPrefix(`/admin.php`) )" + - "traefik.http.routers.${jirafeauServName}-admin.middlewares=test-adminipallowlist@file" + - "traefik.http.routers.${jirafeauServName}.rule=Host(`${fileHost}.${domain}`) && ! ( PathPrefix(`/a-send.php`) || PathPrefix(`/s.php`) || PathPrefix(`/admin.php`) )" + - "traefik.docker.network=jirafeauNet" volumes: fileData: diff --git a/dockers/web/docker-compose.yml b/dockers/web/docker-compose.yml index af2a4df..d304517 100644 --- a/dockers/web/docker-compose.yml +++ b/dockers/web/docker-compose.yml @@ -17,7 +17,11 @@ services: - /etc/timezone:/etc/timezone:ro labels: - "traefik.enable=true" - - "traefik.http.routers.web.rule=Host(`${domain}`) || Host(`www.${domain}`)" + #- "traefik.http.routers.web.rule=Host(`${domain}`) || Host(`www.${domain}`)" + # remplacé par + - "traefik.http.routers.mailfolder.rule=(Host(`${domain}`) || Host(`www.${domain}`)) && (PathPrefix(`/m/`) || PathPrefix(`/mail/`))" + - "traefik.http.routers.web.rule=Host(`web.${domain}`)" + #- "traefik.http.routers.web.middlewares=test-adminipallowlist@file" volumes: html: