nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: certbot: Add verbosity. 

The certificate name wasn't displayed if it wasn't being renewed.

* gnu/services/certbot.scm (certbot-command): Print certificate name before
running the associated command.
master
Clément Lassieur 2018-02-11 01:19:56 +01:00
parent a2cb2bbc0b
commit e216c797f7
No known key found for this signature in database
GPG Key ID: 89F96D4808F359C7
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/services/certbot.scm
View File

@ -78,22 +78,28 @@
(commands
(map
(match-lambda
(($ <certificate-configuration> name domains)
(append
(list certbot "certonly" "-n" "--agree-tos"
"-m" email
"--webroot" "-w" webroot
"--cert-name" (or name (car domains))
"-d" (string-join domains ","))
(if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '()))))
(($ <certificate-configuration> custom-name domains)
(let ((name (or custom-name (car domains))))
(append
(list name certbot "certonly" "-n" "--agree-tos"
"-m" email
"--webroot" "-w" webroot
"--cert-name" name
"-d" (string-join domains ","))
(if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '())))))
certificates)))
(program-file
"certbot-command"
#~(let ((code 0))
(for-each
(lambda (command)
(set! code (or (apply system* command) code)))
'#$commands) code))))))
#~(begin
(use-modules (ice-9 match))
(let ((code 0))
(for-each
(match-lambda
((name . command)
(begin
(format #t "Acquiring or renewing certificate: ~a~%" name)
(set! code (or (apply system* command) code)))))
'#$commands) code)))))))
(define (certbot-renewal-jobs config)
(list