From 9c7969a1273807ab35e923c3ccc17b0831044413 Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Fri, 9 Feb 2024 14:20:55 +0900 Subject: [PATCH] add missing line to enable http challenge --- infrastructure/docker-compose.deploy.yml | 1 + .../docker-compose.development-deploy.yml | 2 +- infrastructure/docker-compose.qa-deploy.yml | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/infrastructure/docker-compose.deploy.yml b/infrastructure/docker-compose.deploy.yml index 508bb3e27..6b4589197 100644 --- a/infrastructure/docker-compose.deploy.yml +++ b/infrastructure/docker-compose.deploy.yml @@ -35,6 +35,7 @@ services: - --certificatesresolvers.certResolver.acme.email=riku@opencrvs.org - --certificatesresolvers.certResolver.acme.storage=acme.json - --certificatesresolvers.certResolver.acme.caserver=https://acme-v02.api.letsencrypt.org/directory + - --certificatesresolvers.certResolver.acme.httpchallenge=true - --certificatesresolvers.certResolver.acme.httpchallenge.entrypoint=web - --entrypoints.web.http.redirections.entryPoint.to=websecure - --entrypoints.web.http.redirections.entryPoint.scheme=https diff --git a/infrastructure/docker-compose.development-deploy.yml b/infrastructure/docker-compose.development-deploy.yml index f26538437..7f2f5a160 100644 --- a/infrastructure/docker-compose.development-deploy.yml +++ b/infrastructure/docker-compose.development-deploy.yml @@ -108,8 +108,8 @@ services: - --certificatesresolvers.certResolver.acme.email=riku@opencrvs.org - --certificatesresolvers.certResolver.acme.storage=acme.json - --certificatesresolvers.certResolver.acme.caserver=https://acme-v02.api.letsencrypt.org/directory + - --certificatesresolvers.certResolver.acme.httpchallenge=true - --certificatesresolvers.certResolver.acme.httpchallenge.entrypoint=web - - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --providers.docker diff --git a/infrastructure/docker-compose.qa-deploy.yml b/infrastructure/docker-compose.qa-deploy.yml index 038751829..029f5e5f8 100644 --- a/infrastructure/docker-compose.qa-deploy.yml +++ b/infrastructure/docker-compose.qa-deploy.yml @@ -6,13 +6,6 @@ services: - overlay_net - vpn command: - - --entrypoints.web.address=:80 - - --entrypoints.websecure.address=:443 - - --providers.docker - - --providers.docker.swarmMode=true - - --api.dashboard=true - - --api.insecure=true - - --log.level=WARNING # Use HTTP-01 challenge as the web server is publicly available # https://doc.traefik.io/traefik/https/acme/#httpchallenge # For DNS-01 challenge and manual certificates, check staging and production configurations @@ -20,6 +13,15 @@ services: - --certificatesresolvers.certResolver.acme.storage=acme.json - --certificatesresolvers.certResolver.acme.caserver=https://acme-v02.api.letsencrypt.org/directory - --certificatesresolvers.certResolver.acme.httpchallenge.entrypoint=web + - --certificatesresolvers.certResolver.acme.httpchallenge=true + + - --entrypoints.web.address=:80 + - --entrypoints.websecure.address=:443 + - --providers.docker + - --providers.docker.swarmMode=true + - --api.dashboard=true + - --api.insecure=true + - --log.level=WARNING - --entrypoints.web.http.redirections.entryPoint.to=websecure - --entrypoints.web.http.redirections.entryPoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.permanent=true