services: certbot: Get certbot to run non-interactively.
* doc/guix.texi (Certificate Services): Add email field and link to the ACME Subscriber Agreement. * 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.
This commit is contained in:
parent
c1dfcfdf58
commit
65fc1d890d
|
@ -15741,6 +15741,10 @@ revoked, but running it regularly would give your service a chance of
|
||||||
staying online in case a Let's Encrypt-initiated revocation happened for
|
staying online in case a Let's Encrypt-initiated revocation happened for
|
||||||
some reason.
|
some reason.
|
||||||
|
|
||||||
|
By using this service, you agree to the ACME Subscriber Agreement, which
|
||||||
|
can be found there:
|
||||||
|
@url{https://acme-v01.api.letsencrypt.org/directory}.
|
||||||
|
|
||||||
@defvr {Scheme Variable} certbot-service-type
|
@defvr {Scheme Variable} certbot-service-type
|
||||||
A service type for the @code{certbot} Let's Encrypt client.
|
A service type for the @code{certbot} Let's Encrypt client.
|
||||||
@end defvr
|
@end defvr
|
||||||
|
@ -15761,6 +15765,10 @@ files.
|
||||||
A list of domains for which to generate certificates and request
|
A list of domains for which to generate certificates and request
|
||||||
signatures.
|
signatures.
|
||||||
|
|
||||||
|
@item @code{email}
|
||||||
|
Mandatory email used for registration, recovery contact, and important
|
||||||
|
account notifications.
|
||||||
|
|
||||||
@item @code{default-location} (default: @i{see below})
|
@item @code{default-location} (default: @i{see below})
|
||||||
The default @code{nginx-location-configuration}. Because @code{certbot}
|
The default @code{nginx-location-configuration}. Because @code{certbot}
|
||||||
needs to be able to serve challenges and responses, it needs to be able
|
needs to be able to serve challenges and responses, it needs to be able
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
(default "/var/www"))
|
(default "/var/www"))
|
||||||
(domains certbot-configuration-domains
|
(domains certbot-configuration-domains
|
||||||
(default '()))
|
(default '()))
|
||||||
|
(email certbot-configuration-email)
|
||||||
(default-location certbot-configuration-default-location
|
(default-location certbot-configuration-default-location
|
||||||
(default
|
(default
|
||||||
(nginx-location-configuration
|
(nginx-location-configuration
|
||||||
|
@ -59,12 +60,14 @@
|
||||||
|
|
||||||
(define certbot-command
|
(define certbot-command
|
||||||
(match-lambda
|
(match-lambda
|
||||||
(($ <certbot-configuration> package webroot domains default-location)
|
(($ <certbot-configuration> package webroot domains email
|
||||||
|
default-location)
|
||||||
(let* ((certbot (file-append package "/bin/certbot"))
|
(let* ((certbot (file-append package "/bin/certbot"))
|
||||||
(commands
|
(commands
|
||||||
(map
|
(map
|
||||||
(lambda (domain)
|
(lambda (domain)
|
||||||
(list certbot "certonly"
|
(list certbot "certonly" "-n" "--agree-tos"
|
||||||
|
"-m" email
|
||||||
"--webroot" "-w" webroot
|
"--webroot" "-w" webroot
|
||||||
"-d" domain))
|
"-d" domain))
|
||||||
domains)))
|
domains)))
|
||||||
|
@ -85,7 +88,8 @@
|
||||||
|
|
||||||
(define (certbot-activation config)
|
(define (certbot-activation config)
|
||||||
(match config
|
(match config
|
||||||
(($ <certbot-configuration> package webroot domains default-location)
|
(($ <certbot-configuration> package webroot domains email
|
||||||
|
default-location)
|
||||||
(with-imported-modules '((guix build utils))
|
(with-imported-modules '((guix build utils))
|
||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
|
@ -94,7 +98,8 @@
|
||||||
|
|
||||||
(define certbot-nginx-server-configurations
|
(define certbot-nginx-server-configurations
|
||||||
(match-lambda
|
(match-lambda
|
||||||
(($ <certbot-configuration> package webroot domains default-location)
|
(($ <certbot-configuration> package webroot domains email
|
||||||
|
default-location)
|
||||||
(map
|
(map
|
||||||
(lambda (domain)
|
(lambda (domain)
|
||||||
(nginx-server-configuration
|
(nginx-server-configuration
|
||||||
|
@ -127,7 +132,6 @@
|
||||||
(domains (append
|
(domains (append
|
||||||
(certbot-configuration-domains config)
|
(certbot-configuration-domains config)
|
||||||
additional-domains)))))
|
additional-domains)))))
|
||||||
(default-value (certbot-configuration))
|
|
||||||
(description
|
(description
|
||||||
"Automatically renew @url{https://letsencrypt.org, Let's
|
"Automatically renew @url{https://letsencrypt.org, Let's
|
||||||
Encrypt} HTTPS certificates by adjusting the nginx web server configuration
|
Encrypt} HTTPS certificates by adjusting the nginx web server configuration
|
||||||
|
|
Loading…
Reference in New Issue