summary refs log tree commit diff
path: root/gnu/services
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/services
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/services')
-rw-r--r--gnu/services/web.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 1af32278c1..51cd9da1dd 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -102,9 +102,9 @@
   (try-files           nginx-server-configuration-try-files
                        (default '()))
   (ssl-certificate     nginx-server-configuration-ssl-certificate
-                       (default "/etc/nginx/cert.pem"))
+                       (default #f))
   (ssl-certificate-key nginx-server-configuration-ssl-certificate-key
-                       (default "/etc/nginx/key.pem"))
+                       (default #f))
   (server-tokens?      nginx-server-configuration-server-tokens?
                        (default #f)))