diff --git a/conf/traefik.toml b/conf/traefik.toml deleted file mode 100644 index 655ea11..0000000 --- a/conf/traefik.toml +++ /dev/null @@ -1,32 +0,0 @@ -[global] - checkNewVersion=true - sendAnonymousUsage=false - -[accesslog] - -[log] - level = "WARNING" - -[api] - dashboard = true - -[entryPoints] - [entryPoints.web] - address = ":80" - [entryPoints.web.http] - [entryPoints.web.http.redirections] - [entryPoints.web.http.redirections.entryPoint] - to = "websecure" - scheme = "https" - [entryPoints.websecure] - address = ":443" - -[certificatesResolvers.myresolver.acme] - email = "florestan@bredow.fr" - storage = "acme.json" - [certificatesResolvers.myresolver.acme.httpChallenge] - entryPoint = "web" - -[providers.docker] - exposedByDefault = false - network = "web" diff --git a/conf/traefik.yml b/conf/traefik.yml new file mode 100644 index 0000000..8e30278 --- /dev/null +++ b/conf/traefik.yml @@ -0,0 +1,41 @@ +global: + checkNewVersion: false + sendAnonymousUsage: false + +# Log les accès sur la sortie standard. +accesslog: {} + +log: + level: "WARN" + +api: + dashboard: true + +entryPoints: + web: + address: ":80" + http: + redirections: + entryPoint: + to: "websecure" + scheme: "https" + websecure: + enablehttp3: true + address: ":443" + +certificatesResolvers: + myresolver: + acme: + email: "florestan.bredow@supagro.fr" + storage: "acme.json" + httpChallenge: + entryPoint: "web" + +providers: + file: + directory: "/etc/traefik/dynamic" + +providers: + docker: + exposedBydefault: false + network: "web" diff --git a/docker-compose.yml b/docker-compose.yml index 7fecef4..4a4a1a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,8 @@ version: '3.8' services: traefik: - image: traefik:2.3 + image: traefik:2.5 + restart: always ports: - "80:80" - "443:443" @@ -10,9 +11,9 @@ services: - web volumes: - /var/run/docker.sock:/var/run/docker.sock - - ./conf/traefik.toml:/etc/traefik/traefik.toml:ro + - ./conf/traefik.yml:/etc/traefik/traefik.yml:ro - ./conf/acme.json:/acme.json - - ./conf/custom:/etc/traefik/custom:ro + - ./conf/dynamic:/etc/traefik/dynamic:ro labels: - traefik.enable=true - traefik.http.routers.dashboard.rule=Host(`${HOSTNAME}`)