From 42f16ced25bc2fff66467890a1a9680ee748bd92 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Thu, 23 Sep 2021 23:54:03 +0200 Subject: [PATCH 1/3] drop ttl until the bug is fixed --- docker/caddy/caddy.json.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/caddy/caddy.json.template b/docker/caddy/caddy.json.template index 30e05466..de5efcbf 100644 --- a/docker/caddy/caddy.json.template +++ b/docker/caddy/caddy.json.template @@ -25,8 +25,7 @@ "provider": { "name": "route53", "max_retries": 100 - }, - "ttl": "15m" + } } } } From 3a41bc9ae7d4867f107de987e08948f4a7e3cdd6 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 24 Sep 2021 01:26:39 +0200 Subject: [PATCH 2/3] change caddy running container from builder to alpine --- docker/caddy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Dockerfile b/docker/caddy/Dockerfile index 16ee74ae..b9c09acd 100644 --- a/docker/caddy/Dockerfile +++ b/docker/caddy/Dockerfile @@ -3,7 +3,7 @@ FROM caddy:2.4.5-builder AS caddy-builder # available dns resolvers: https://github.com/caddy-dns RUN xcaddy build --with github.com/caddy-dns/route53 -FROM caddy:2.4.5-builder +FROM caddy:2.4.5-alpine COPY --from=caddy-builder /usr/bin/caddy /usr/bin/caddy From f1240c7c60cc66aa6c479b83f40e3c948742edca Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 24 Sep 2021 01:27:03 +0200 Subject: [PATCH 3/3] drop max_retries and add email to caddy dns challenge --- changelog/items/bugs-fixed/fix-caddy.md | 1 + docker/caddy/caddy.json.template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/items/bugs-fixed/fix-caddy.md diff --git a/changelog/items/bugs-fixed/fix-caddy.md b/changelog/items/bugs-fixed/fix-caddy.md new file mode 100644 index 00000000..83a92989 --- /dev/null +++ b/changelog/items/bugs-fixed/fix-caddy.md @@ -0,0 +1 @@ +- fixed issue with caddy requesting new certificates instead of using existing ones from file storage diff --git a/docker/caddy/caddy.json.template b/docker/caddy/caddy.json.template index de5efcbf..a133f0cd 100644 --- a/docker/caddy/caddy.json.template +++ b/docker/caddy/caddy.json.template @@ -20,11 +20,11 @@ "issuers": [ { "module": "acme", + "email": "{{EMAIL_ADDRESS}}", "challenges": { "dns": { "provider": { - "name": "route53", - "max_retries": 100 + "name": "route53" } } }