diff --git a/traefik-docker-compose.yaml b/traefik-docker-compose.yaml index 50fba3d..c0e03a4 100644 --- a/traefik-docker-compose.yaml +++ b/traefik-docker-compose.yaml @@ -4,26 +4,25 @@ services: container_name: traefik restart: unless-stopped command: - - "--api.insecure=false" - - "--api.dashboard=true" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--providers.docker.network=proxy" - - "--entryPoints.web.address=:80" - - "--entryPoints.websecure.address=:443" - - "--entryPoints.websecure.http.tls=true" - - "--entryPoints.web.http.redirections.entryPoint.to=websecure" - - "--entryPoints.web.http.redirections.entryPoint.scheme=https" - - --serversTransport.insecureSkipVerify=true - - "--providers.file.directory=/etc/traefik/dynamic/" - - "--providers.file.watch=true" - # Let's Encrypt - - "--certificatesresolvers.le.acme.email=${EMAIL:-bobrovod@national.shitposting.agency}" - - "--certificatesresolvers.le.acme.storage=/letsencrypt/acme.json" - - "--certificatesresolvers.le.acme.httpchallenge.entrypoint=web" + - "--api.insecure=false" + - "--api.dashboard=true" + - "--providers.docker=true" + - "--providers.docker.exposedbydefault=false" + - "--providers.docker.network=traefik-proxy" + - "--entryPoints.web.address=:80" + - "--entryPoints.websecure.address=:443" + - "--entryPoints.websecure.http.tls=true" + - "--entryPoints.web.http.redirections.entryPoint.to=websecure" + - "--entryPoints.web.http.redirections.entryPoint.scheme=https" + - "--serversTransport.insecureSkipVerify=true" + - "--providers.file.directory=/etc/traefik/dynamic" + - "--providers.file.watch=true" labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.enable=true" + - "traefik.http.routers.traefik.rule=Host(`traefik.workstation`)" + - "traefik.http.routers.traefik.entrypoints=websecure" + - "traefik.http.routers.traefik.service=api@internal" + - "traefik.http.routers.traefik.tls=true" ports: - "80:80" - "443:443" @@ -32,9 +31,9 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - ./traefik/certs:/certs:ro - ./traefik/dynamic:/etc/traefik/dynamic:ro - - ./traefik/letsencrypt:/letsencrypt networks: - traefik-proxy + networks: traefik-proxy: external: true \ No newline at end of file diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml index 937d62f..6f4fd4b 100644 --- a/traefik/dynamic/services.yml +++ b/traefik/dynamic/services.yml @@ -6,8 +6,7 @@ http: entryPoints: - websecure service: api@internal - tls: - certResolver: le + tls: {} # Portainer portainer: @@ -15,8 +14,7 @@ http: entryPoints: - websecure service: portainer - tls: - certResolver: le + tls: {} # AdGuard Home adguard-redirect: @@ -32,8 +30,7 @@ http: entryPoints: - websecure service: adguard - tls: - certResolver: le + tls: {} # Nextcloud AIO Interface nextcloud-aio: @@ -41,8 +38,7 @@ http: entryPoints: - websecure service: nextcloud-aio - tls: - certResolver: le + tls: {} # Nextcloud Main nextcloud: @@ -50,8 +46,7 @@ http: entryPoints: - websecure service: nextcloud - tls: - certResolver: le + tls: {} # Dockmon dockmon: @@ -59,8 +54,7 @@ http: entryPoints: - websecure service: dockmon - tls: - certResolver: le + tls: {} # Glance glance: @@ -68,8 +62,7 @@ http: entryPoints: - websecure service: glance - tls: - certResolver: le + tls: {} # Watercrawl (edu_master) watercrawl: @@ -77,8 +70,7 @@ http: entryPoints: - websecure service: watercrawl - tls: - certResolver: le + tls: {} # N8N n8n: @@ -86,8 +78,7 @@ http: entryPoints: - websecure service: n8n - tls: - certResolver: le + tls: {} services: # Portainer diff --git a/traefik/dynamic/tls.yml b/traefik/dynamic/tls.yml index 0baad5c..9f7302b 100644 --- a/traefik/dynamic/tls.yml +++ b/traefik/dynamic/tls.yml @@ -1,4 +1,19 @@ tls: certificates: - - certFile: /certs/workstation+3.pem - keyFile: /certs/workstation+3-key.pem + - certFile: /certs/workstation+1.pem + keyFile: /certs/workstation+1-key.pem + + stores: + default: + defaultCertificate: + certFile: /certs/workstation+1.pem + keyFile: /certs/workstation+1-key.pem + + options: + default: + minVersion: VersionTLS12 + sniStrict: true + cipherSuites: + - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ No newline at end of file