summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlo Zancanaro <carlo@zancanaro.id.au>2019-08-10 22:52:50 +1000
committerLudovic Courtès <ludo@gnu.org>2019-09-16 10:22:35 +0200
commitec36339dfd2241cd518bb86b6714fc3b340afa95 (patch)
tree10445470dd0a2ab22f9352a10cabb1aeb7443d74
parentfb6e550d6b054371bff5d27f4c368a8cd977bb40 (diff)
services: certbot: Add --manual-public-ip-logging-ok for manual challenges
* gnu/services/certbot.scm (certbot-command): Add --manual-public-ip-logging-ok flag to the certbot command when doing a manual challenge. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/guix.texi4
-rw-r--r--gnu/services/certbot.scm1
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 39d4b865f65..55935b37948 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20302,7 +20302,9 @@ all domains will be Subject Alternative Names on the certificate.
20302The challenge type that has to be run by certbot. If @code{#f} is specified, 20302The challenge type that has to be run by certbot. If @code{#f} is specified,
20303default to the HTTP challenge. If a value is specified, defaults to the 20303default to the HTTP challenge. If a value is specified, defaults to the
20304manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and 20304manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and
20305the documentation at @url{https://certbot.eff.org/docs/using.html#hooks}). 20305the documentation at @url{https://certbot.eff.org/docs/using.html#hooks}),
20306and gives Let's Encrypt permission to log the public IP address of the
20307requesting machine.
20306 20308
20307@item @code{authentication-hook} (default: @code{#f}) 20309@item @code{authentication-hook} (default: @code{#f})
20308Command to be run in a shell once for each certificate challenge to be 20310Command to be run in a shell once for each certificate challenge to be
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm
index ae34ad17bb7..0d3be033838 100644
--- a/gnu/services/certbot.scm
+++ b/gnu/services/certbot.scm
@@ -99,6 +99,7 @@
99 "--manual" 99 "--manual"
100 (string-append "--preferred-challenges=" challenge) 100 (string-append "--preferred-challenges=" challenge)
101 "--cert-name" name 101 "--cert-name" name
102 "--manual-public-ip-logging-ok"
102 "-d" (string-join domains ",")) 103 "-d" (string-join domains ","))
103 (if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '()) 104 (if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '())
104 (if authentication-hook 105 (if authentication-hook