From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1em4in-0005Ej-9N for guix-patches@gnu.org; Wed, 14 Feb 2018 16:36:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1em4im-00017j-1c for guix-patches@gnu.org; Wed, 14 Feb 2018 16:36:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1em4il-00017W-Uh for guix-patches@gnu.org; Wed, 14 Feb 2018 16:36:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1em4ij-0001yJ-Ty for guix-patches@gnu.org; Wed, 14 Feb 2018 16:36:07 -0500 Subject: [bug#30459] [PATCH 10/11] services: certbot: Add verbosity. Resent-Message-ID: From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Wed, 14 Feb 2018 22:35:03 +0100 Message-Id: <20180214213504.29984-10-clement@lassieur.org> In-Reply-To: <20180214213504.29984-1-clement@lassieur.org> References: <20180214213504.29984-1-clement@lassieur.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30459@debbugs.gnu.org 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. --- gnu/services/certbot.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm index 51f5d719a..f90e4f04b 100644 --- a/gnu/services/certbot.scm +++ b/gnu/services/certbot.scm @@ -78,22 +78,28 @@ (commands (map (match-lambda - (($ 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) '())))) + (($ 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 -- 2.16.1