diff options
| author | Raghav Gururajan <rg@raghavgururajan.name> | 2021-06-24 14:14:37 -0400 |
|---|---|---|
| committer | Raghav Gururajan <rg@raghavgururajan.name> | 2021-06-24 18:19:39 -0400 |
| commit | 1bf1226a4fe12d65a95792ec4f74b86b5ed26221 (patch) | |
| tree | d9a8a252f4d0c092251c8303b9b933eef71d3103 /gnu/services | |
| parent | d3e8890613f62a6fc2620e544e34fc64ceb832e7 (diff) | |
| download | guix-1bf1226a4fe12d65a95792ec4f74b86b5ed26221.tar guix-1bf1226a4fe12d65a95792ec4f74b86b5ed26221.tar.gz | |
services: certbot: Add option to use CSR file.
* gnu/services/certbot.scm (<certificate-configuration>): Add csr field.
(certbot-command): Modify.
* doc/guix.texi (Certificate Services): Document it.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/certbot.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm index 1c67ff63f1..1c819bef48 100644 --- a/gnu/services/certbot.scm +++ b/gnu/services/certbot.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,8 @@ (default '())) (challenge certificate-configuration-challenge (default #f)) + (csr certificate-configuration-csr + (default #f)) (authentication-hook certificate-authentication-hook (default #f)) (cleanup-hook certificate-cleanup-hook @@ -94,8 +97,8 @@ (map (match-lambda (($ <certificate-configuration> custom-name domains challenge - authentication-hook cleanup-hook - deploy-hook) + csr authentication-hook + cleanup-hook deploy-hook) (let ((name (or custom-name (car domains)))) (if challenge (append @@ -105,6 +108,7 @@ "--cert-name" name "--manual-public-ip-logging-ok" "-d" (string-join domains ",")) + (if csr `("--csr" ,csr) '()) (if email `("--email" ,email) '("--register-unsafely-without-email")) @@ -120,6 +124,7 @@ "--webroot" "-w" webroot "--cert-name" name "-d" (string-join domains ",")) + (if csr `("--csr" ,csr) '()) (if email `("--email" ,email) '("--register-unsafely-without-email")) |