diff --git a/.env.default b/.env.default index cddb4c4..5a79c6c 100644 --- a/.env.default +++ b/.env.default @@ -1,2 +1,2 @@ -SITE=localhost -TZ=Europe/Paris +DOMAIN=localhost +TZ=Europe/Paris \ No newline at end of file diff --git a/glances/docker-compose.yml b/glances/docker-compose.yml index 5247155..6995086 100644 --- a/glances/docker-compose.yml +++ b/glances/docker-compose.yml @@ -17,8 +17,7 @@ services: - 61208 labels: - traefik.enable=true - - traefik.http.routers.glances.rule=Host(`${SITE}`) && Path(`/top`) - - traefik.http.middlewares.glances.stripprefix.prefixes=/top,/top/ + - traefik.http.routers.glances.rule=Host(`glances.${DOMAIN}`) - traefik.http.routers.glances.entrypoints=web - traefik.http.services.glances.loadbalancer.server.port=61208 diff --git a/portainer/docker-compose.yml b/portainer/docker-compose.yml index d840e88..a64b00e 100644 --- a/portainer/docker-compose.yml +++ b/portainer/docker-compose.yml @@ -15,7 +15,7 @@ services: - 9000 labels: - traefik.enable=true - - traefik.http.routers.portainer.rule=Host(`${SITE}`) && Path(`/console`) + - traefik.http.routers.portainer.rule=Host(`portainer.${SITE}`) - traefik.http.routers.portainer.entrypoints=web - traefik.http.services.portainer.loadbalancer.server.port=9000 diff --git a/traefik/logs/.gitkeep b/traefik/logs/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/traefik/traefik.toml b/traefik/traefik.toml deleted file mode 100644 index 0b9aad0..0000000 --- a/traefik/traefik.toml +++ /dev/null @@ -1,42 +0,0 @@ -[global] - checkNewVersion = false - sendAnonymousUsage = false - -[log] - level = "WARNING" - filePath = "/logs/traefik.log" - format = "json" - -[accessLog] - filePath = "/logs/access.log" - format = "json" - bufferingSize = 100 - -[api] - dashboard = true - debug = false - insecure = true - -[providers] - [providers.docker] - watch = true - exposedByDefault = false - swarmMode = false - network = "1-docker_srv" - -[entryPoints] - [entryPoints.web] - address = ":80" - [entryPoints.websecure] - address = ":443" - -[certificatesResolvers] - [certificatesResolvers.letsencrypt] - [certificatesResolvers.letsencrypt.acme] - email = "kianby@madyanne.fr" - caServer = "https://acme-v02.api.letsencrypt.org/directory" - storage = "acme.json" - keyType = "EC384" - [certificatesResolvers.letsencrypt.acme.httpChallenge] - entryPoint = "web" - diff --git a/traefik/traefik_dynamic.toml b/traefik/traefik_dynamic.toml deleted file mode 100644 index afde8cc..0000000 --- a/traefik/traefik_dynamic.toml +++ /dev/null @@ -1,41 +0,0 @@ -[tls] - [tls.options] - [tls.options.default] - minVersion = "VersionTLS12" - sniStrict = true - cipherSuites = [ - "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", - "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", - "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305", - "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", - "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", - "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", - "TLS_AES_128_GCM_SHA256", - "TLS_AES_256_GCM_SHA384", - "TLS_CHACHA20_POLY1305_SHA256" - ] - curvePreferences = ["CurveP521","CurveP384"] - -[http] - [http.middlewares.compression.compress] - excludedContentTypes = ["text/event-stream"] - - [http.middlewares.https-redirect.redirectScheme] - scheme = "https" - permanent = true - - [http.middlewares.security.headers] - accessControlAllowMethods = ["GET", "OPTIONS", "PUT"] - accessControlAllowOrigin = "origin-list-or-null" - accessControlMaxAge = 100 - addVaryHeader = true - browserXssFilter = true - contentTypeNosniff = true - forceSTSHeader = true - frameDeny = true - stsIncludeSubdomains = true - stsPreload = true - customFrameOptionsValue = "SAMEORIGIN" - referrerPolicy = "same-origin" - featurePolicy = "vibrate 'self'" - stsSeconds = 315360000