From d917b3d54ad4ad45bd6b751c8c9d96e234b336ff Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Silva Date: Wed, 12 Jun 2024 15:25:27 +0100 Subject: [PATCH] Fixed errors with staging-related config --- docker/compose.staging.yaml | 8 ++++---- docker/traefik/staging-config.toml | 16 +++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/docker/compose.staging.yaml b/docker/compose.staging.yaml index 91997b54..9295f089 100644 --- a/docker/compose.staging.yaml +++ b/docker/compose.staging.yaml @@ -23,15 +23,15 @@ name: arpav-ppcv-staging services: + # NOTE: this traefik instance does not deal with TLS at all, as we assume there + # is another proxy running on top of this one, provided + # by the staging env reverse-proxy: command: --configFile /opt/traefik/traefik.toml volumes: - type: bind - source: home/arpav/docker/traefik/staging-config.toml + source: /home/arpav/docker/traefik/staging-config.toml target: /opt/traefik/traefik.toml - - type: bind - source: /opt/traefik/certs - target: /opt/traefik/certs webapp: env_file: diff --git a/docker/traefik/staging-config.toml b/docker/traefik/staging-config.toml index 94993230..61c1a3ca 100644 --- a/docker/traefik/staging-config.toml +++ b/docker/traefik/staging-config.toml @@ -12,23 +12,13 @@ [accessLog] [entryPoints] -[entryPoints.webSecure] -address = ":443" +[entryPoints.web] +address = ":80" -[entryPoints.webSecure.forwardedHeaders] +[entryPoints.web.forwardedHeaders] insecure = true [providers] [providers.docker] exposedByDefault = false - -[certificatesResolvers.letsEncryptResolver.acme] -email = "francesco.bartoli@geobeyond.it" -storage = "/opt/traefik/certs/acme.json" - -# Default: "https://acme-v02.api.letsencrypt.org/directory" -# the default is the production lets encrypt server -# caServer = "https://acme-staging-v02.api.letsencrypt.org/directory" - -[certificatesResolvers.letsEncryptResolver.acme.tlsChallenge]