--- Begin Message ---
|
Subject: |
[PATCH] web: Don't error about missing ssl related files. |
|
Date: |
Mon, 27 Nov 2017 08:26:20 +0000 |
Erroring here prevents doing things like building a system using nginx on a
different machine from where it's intended to be deployed, or creating
containers and VMs that use the ssl-certificate parts of the nginx
configuration, without also getting these files to exist.
* gnu/services/web.scm (emit-nginx-server-config): Don't error on missing ssl
related files.
---
gnu/services/web.scm | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 9d713003c..1af32278c 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -191,16 +191,6 @@ of index files."
(syntax-parameterize ((<> (identifier-syntax x*)))
(list tail ...))
'())))
- (for-each
- (match-lambda
- ((record-key . file)
- (if (and file (not (file-exists? file)))
- (error
- (simple-format
- #f
- "~A in the nginx configuration for the server with name \"~A\"
does not exist" record-key server-name)))))
- `(("ssl-certificate" . ,ssl-certificate)
- ("ssl-certificate-key" . ,ssl-certificate-key)))
(list
" server {\n"
(and/l http-port " listen " (number->string <>) ";\n")
--
2.14.2
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#29467] [PATCH 2/2] services: web: Remove default certificate and key files for nginx. |
|
Date: |
Mon, 11 Dec 2017 20:41:04 +0000 |
|
User-agent: |
mu4e 0.9.18; emacs 25.3.1 |
Ludovic Courtès <address@hidden> writes:
> Christopher Baines <address@hidden> skribis:
>
>> If nginx is configured with a ssl-certificate file, and ssl-certificate-key,
>> it will fail to start unless these exist. To avoid this happening, change the
>> default to #f.
>>
>> * gnu/services/web.scm (<nginx-server-configuration>)
>> [ssl-certificate,ssl-certificate-key]: Set the defaults to #f.
>> * gnu/tests/web.scm (%nginx-servers): Remove redundant
>> nginx-server-configuration fields.
>> * doc/guix.texi (Web Services): Update examples and documentation.
>
> LGTM, thanks!
Great, I've now pushed these two patches.
Thanks for reviewing :)
signature.asc
Description: PGP signature
--- End Message ---