diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-03-16 02:16:38 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-03-16 03:19:55 +0100 |
| commit | 2ec46078630a09b326822a7565fc7764fd9957a7 (patch) | |
| tree | 91741e7df30f622f281fc6ed1b12f3bdb4ce47ab | |
| parent | 8bbbbb39350eb559951972abae2622195393b51e (diff) | |
| download | guix-2ec46078630a09b326822a7565fc7764fd9957a7.tar.gz | |
services: nginx: Fix broken default configuration.
* gnu/services/web.scm (nginx-configuration): Emit an empty events{}
block by default.
* doc/guix.texi (Web Services): Document it.
| -rw-r--r-- | doc/guix.texi | 2 | ||||
| -rw-r--r-- | gnu/services/web.scm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 28808b0cd5..202d1347f7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20272,7 +20272,7 @@ names of loadable modules, as in this example: /etc/nginx/modules/ngx_http_accept_language_module.so"))) @end lisp -@item @code{global-directives} (default: @code{'()}) +@item @code{global-directives} (default: @code{'((events . ()))}) Association list of global directives for the top level of the nginx configuration. Values may themselves be association lists. diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3edc751ea2..ac247ec39a 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -529,7 +530,8 @@ (server-names-hash-bucket-max-size nginx-configuration-server-names-hash-bucket-max-size (default #f)) (modules nginx-configuration-modules (default '())) - (global-directives nginx-configuration-global-directives (default '())) + (global-directives nginx-configuration-global-directives + (default '((events . ())))) (extra-content nginx-configuration-extra-content (default "")) (file nginx-configuration-file ;#f | string | file-like |