summary refs log tree commit diff
path: root/gnu/tests
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2017-12-09 09:24:07 +0000
committerChristopher Baines <mail@cbaines.net>2017-12-11 20:36:43 +0000
commitc48aa70a9aa68ac6f365663044357be77eb9e36a (patch)
treed5fe265f31c54b97be4fb7f87675780679743523 /gnu/tests
parentb7db2c63ed5984c4886731943d6cabefe4a05fb1 (diff)
downloadguix-c48aa70a9aa68ac6f365663044357be77eb9e36a.tar.gz
services: web: Remove default certificate and key files for nginx.
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.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/web.scm5
1 files changed, 1 insertions, 4 deletions
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index 3fa272c676..de7ab3cd65 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -45,10 +45,7 @@
   ;; Server blocks.
   (list (nginx-server-configuration
          (root "/srv")
-         (http-port 8042)
-         (https-port #f)
-         (ssl-certificate #f)
-         (ssl-certificate-key #f))))
+         (http-port 8042))))
 
 (define %nginx-os
   ;; Operating system under test.