mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-27 19:41:50 +02:00
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user