From 3d2929dca21fd493ceb7877a58c32cda195ab5ea Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Wed, 28 Apr 2021 11:55:45 +0200 Subject: [PATCH 1/3] Makefile: include missing letsencrypt.toml reference Signed-off-by: Ralf Zerres --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 739044c..820858a 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ install: install -m 0644 $(TARGET_DIR)/man/acmed.toml.5.gz $(DESTDIR)$(MAN5DIR)/acmed.toml.5.gz; \ install -m 0644 acmed/config/acmed.toml $(DESTDIR)$(SYSCONFDIR)/acmed/acmed.toml; \ install -m 0644 acmed/config/default_hooks.toml $(DESTDIR)$(SYSCONFDIR)/acmed/default_hooks.toml; \ + install -m 0644 acmed/config/letsencrypt.toml $(DESTDIR)$(SYSCONFDIR)/acmed/letsencrypt.toml; \ fi if test -f "$(TARGET_DIR)/tacd"; then \ install -m 0755 $(TARGET_DIR)/tacd $(DESTDIR)$(BINDIR)/tacd; \ From aaf641cc68953c714396d5397d9a6b6627002cff Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Wed, 28 Apr 2021 11:56:27 +0200 Subject: [PATCH 2/3] letsencrypt.toml: wording update * use precise strings referencing endpoint name and limits Signed-off-by: Ralf Zerres --- acmed/config/letsencrypt.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/acmed/config/letsencrypt.toml b/acmed/config/letsencrypt.toml index 80ea99a..60700f4 100644 --- a/acmed/config/letsencrypt.toml +++ b/acmed/config/letsencrypt.toml @@ -1,16 +1,16 @@ [[rate-limit]] -name = "LE min" +name = "Let's Encrypt rate-limit" number = 20 period = "1s" [[endpoint]] -name = "letsencrypt v2 prod" +name = "Let's Encrypt v2 production" url = "https://acme-v02.api.letsencrypt.org/directory" -rate_limits = ["LE min"] +rate_limits = ["Let's Encrypt rate-limit"] tos_agreed = false [[endpoint]] -name = "letsencrypt v2 staging" +name = "Let's Encrypt v2 staging" url = "https://acme-staging-v02.api.letsencrypt.org/directory" -rate_limits = ["LE min"] +rate_limits = ["Let's Encrypt rate-limit"] tos_agreed = false From fb7704056e2c657482840cc389fb9e4c60c9f3f3 Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Wed, 28 Apr 2021 13:23:33 +0200 Subject: [PATCH 3/3] acmed.toml: comment updates Signed-off-by: Ralf Zerres --- acmed/config/acmed.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/acmed/config/acmed.toml b/acmed/config/acmed.toml index 6510a24..82ab33e 100644 --- a/acmed/config/acmed.toml +++ b/acmed/config/acmed.toml @@ -1,4 +1,10 @@ +# ------------------------------------------------------------------------ +# Base configruation for ACMEd +# You should adapt this file to include/enhance with your custom toml's +# ------------------------------------------------------------------------ + include = [ "default_hooks.toml", "letsencrypt.toml", + "my_server.toml" ]