diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-13 17:21:32 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-13 17:21:32 +0200 |
| commit | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (patch) | |
| tree | 8377d7c70a925f7c5ea4c04473c4eb547610b64b /gnu/services/certbot.scm | |
| parent | a3ac317ab4a90f66ac65055fa26dee58ed2367b8 (diff) | |
| parent | dd4c1992103a65b8fbdc80fe07a9fe9be822769a (diff) | |
| download | guix-emacs-team.tar.gz | |
Merge branch 'master' into emacs-team emacs-team
Diffstat (limited to 'gnu/services/certbot.scm')
| -rw-r--r-- | gnu/services/certbot.scm | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm index 8e6784df2b..0c45471659 100644 --- a/gnu/services/certbot.scm +++ b/gnu/services/certbot.scm @@ -173,20 +173,24 @@ (match-lambda (($ <certbot-configuration> package webroot certificates email server rsa-key-size default-location) - (list - (nginx-server-configuration - (listen '("80" "[::]:80")) - (ssl-certificate #f) - (ssl-certificate-key #f) - (server-name - (apply append (map certificate-configuration-domains certificates))) - (locations - (filter identity - (list - (nginx-location-configuration - (uri "/.well-known") - (body (list (list "root " webroot ";")))) - default-location)))))))) + (define (certificate->nginx-server certificate-configuration) + (match-record certificate-configuration <certificate-configuration> + (domains challenge) + (nginx-server-configuration + (listen '("80" "[::]:80")) + (ssl-certificate #f) + (ssl-certificate-key #f) + (server-name domains) + (locations + (filter identity + (append + (if challenge + '() + (list (nginx-location-configuration + (uri "/.well-known") + (body (list (list "root " webroot ";")))))) + (list default-location))))))) + (map certificate->nginx-server certificates)))) (define certbot-service-type (service-type (name 'certbot) |