From 51d93884bf90ac976fe49755aa38250d75d27131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A8ve=20Caillault?= Date: Fri, 12 Dec 2025 22:05:41 +0100 Subject: [PATCH] =?UTF-8?q?Suppression=20de=20Traefik=20de=20la=20configur?= =?UTF-8?q?ation=20qui=20doit=20=C3=AAtre=20install=C3=A9=20globalement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 9 -------- .gitignore | 2 -- README.md | 7 +----- docker-compose.yml | 40 --------------------------------- host/certs/letsencrypt/.gitkeep | 0 tls.yaml | 4 ---- 6 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 host/certs/letsencrypt/.gitkeep delete mode 100644 tls.yaml diff --git a/.env.example b/.env.example index 6a9cfcf..4440927 100644 --- a/.env.example +++ b/.env.example @@ -12,15 +12,6 @@ CONTAINER_PREFIX="" # URL principale du projet PROJECT_URL="" -# Traefik -TRAEFIK_IMAGE=traefik:v3.6 -# URL d'accès au dashboard de Traefik -TRAEFIK_URL="" -# Basic Auth pour le Dashboard -TRAEFIK_HTPASSWD="" -# Email pour Let's Encrypt -LETSENCRYPT_EMAIL="" - # Base de données DATABASE_IMAGE="mariadb:12" DATABASE_ROOT_PASSWORD="" diff --git a/.gitignore b/.gitignore index fc0389f..5f05490 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ .env host/apache/logs/*.log -host/certs/*.crt -host/certs/*.key host/database/data/* !host/database/data/.gitkeep host/database/backups/* diff --git a/README.md b/README.md index 9ec05e0..bc11763 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,4 @@ -Créer le réseau frontend : docker network create frontend - -Pour générer le htpasswd nécessaire pour le dashboard de Traefik : -sudo apt install apache2-utils -htpasswd -nb "" | sed -e 's/\$/\$\$/g' -Remplacer la valeur obtenue dans le fichier .env (TRAEFIK_HTPASSWD). +Nécessite d'avoir installé Traefik globalement : https://github.com/steve-caillault/docker-traefik. Attention avant de démarrer Docker, vérifier que l'utilisateur 1000 et que le groupe 1000 existent bien : getent passwd 1000 Puis exécuter la commande : sudo chown -R 1000:1000 ./host diff --git a/docker-compose.yml b/docker-compose.yml index 42a58d1..04ce4cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,46 +6,6 @@ networks: services: - # Configuration de Traefik - traefik: - image: ${TRAEFIK_IMAGE} - container_name: ${CONTAINER_PREFIX}_traefik - command: - - "--api.dashboard=true" - - "--api.insecure=false" - # - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--providers.docker.network=frontend" - - "--providers.file.filename=./tls.yaml" - # - - "--entrypoints.web.address=:80" - - "--entrypoints.web.http.redirections.entrypoint.to=websecure" - - "--entrypoints.web.http.redirections.entrypoint.scheme=https" - - "--entrypoints.web.http.redirections.entrypoint.permanent=true" - - "--entrypoints.websecure.address=:443" - - "--entrypoints.websecure.http.tls=true" - # - labels: - - "traefik.enable=true" - # - - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.rule=Host(`${TRAEFIK_URL}`)" - - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.entrypoints=websecure" - - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.service=api@internal" - - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.tls=true" - - "traefik.http.middlewares.${CONTAINER_PREFIX}_traefik_dashboard-auth.basicauth.users=${TRAEFIK_HTPASSWD}" - - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.middlewares=${CONTAINER_PREFIX}_traefik_dashboard-auth@docker" - ports: - - "80:80" - - "443:443" - - "8080:8080" - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./certs:/certs:ro - networks: - - frontend - - backend - # Configuration de la base de données avec MariaDB database: restart: unless-stopped diff --git a/host/certs/letsencrypt/.gitkeep b/host/certs/letsencrypt/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/tls.yaml b/tls.yaml deleted file mode 100644 index ef0863d..0000000 --- a/tls.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tls: - certificates: - - certFile: /certs/localhost.crt - - keyFile: /certs/localhost.key