[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30459] [PATCH 06/11] services: certbot: Get certbot to run non-inte
From: |
Clément Lassieur |
Subject: |
[bug#30459] [PATCH 06/11] services: certbot: Get certbot to run non-interactively. |
Date: |
Wed, 14 Feb 2018 22:34:59 +0100 |
* doc/guix.texi (Certificate Services): Add email field.
* gnu/services/certbot.scm (<certbot-configuration>, certbot-command,
certbot-activation, certbot-nginx-server-configurations): Add email field.
(certbot-command): Add '-n' and '--agree-tos' options.
(certbot-service-type): Remove default-value.
---
doc/guix.texi | 4 ++++
gnu/services/certbot.scm | 14 +++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 42f2593d3..e951b3274 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -15696,6 +15696,10 @@ files.
A list of domains for which to generate certificates and request
signatures.
address@hidden @code{email}
+Mandatory email used for registration, recovery contact, and important
+account notifications.
+
@item @code{default-location} (default: @i{see below})
The default @code{nginx-location-configuration}. Because @code{certbot}
needs to be able to serve challenges and responses, it needs to be able
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm
index 661e17498..379c21143 100644
--- a/gnu/services/certbot.scm
+++ b/gnu/services/certbot.scm
@@ -50,6 +50,7 @@
(default "/var/www"))
(domains certbot-configuration-domains
(default '()))
+ (email certbot-configuration-email)
(default-location certbot-configuration-default-location
(default
(nginx-location-configuration
@@ -59,12 +60,14 @@
(define certbot-command
(match-lambda
- (($ <certbot-configuration> package webroot domains default-location)
+ (($ <certbot-configuration> package webroot domains email
+ default-location)
(let* ((certbot (file-append package "/bin/certbot"))
(commands
(map
(lambda (domain)
- (list certbot "certonly"
+ (list certbot "certonly" "-n" "--agree-tos"
+ "-m" email
"--webroot" "-w" webroot
"-d" domain))
domains)))
@@ -85,7 +88,8 @@
(define (certbot-activation config)
(match config
- (($ <certbot-configuration> package webroot domains default-location)
+ (($ <certbot-configuration> package webroot domains email
+ default-location)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
@@ -94,7 +98,8 @@
(define certbot-nginx-server-configurations
(match-lambda
- (($ <certbot-configuration> package webroot domains default-location)
+ (($ <certbot-configuration> package webroot domains email
+ default-location)
(map
(lambda (domain)
(nginx-server-configuration
@@ -127,7 +132,6 @@
(domains (append
(certbot-configuration-domains config)
additional-domains)))))
- (default-value (certbot-configuration))
(description
"Automatically renew @url{https://letsencrypt.org, Let's
Encrypt} HTTPS certificates by adjusting the nginx web server configuration
--
2.16.1
[bug#30459] [PATCH 02/11] services: certbot: Run certbot twice a day at a random minute., Clément Lassieur, 2018/02/14
[bug#30459] [PATCH 07/11] services: certbot: Associate one certificate with several domains., Clément Lassieur, 2018/02/14
[bug#30459] [PATCH 04/11] services: certbot: Rename 'host' to 'domain'., Clément Lassieur, 2018/02/14
[bug#30459] [PATCH 03/11] services: certbot: Fix indentation., Clément Lassieur, 2018/02/14
[bug#30459] [PATCH 09/11] services: certbot: Allow to set RSA key size., Clément Lassieur, 2018/02/14
[bug#30459] [PATCH 11/11] services: certbot: Allow to set a deploy hook., Clément Lassieur, 2018/02/14