branch master updated: services: nginx: Fix broken default configuration.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2ec4607  services: nginx: Fix broken default configuration.
2ec4607 is described below

commit 2ec46078630a09b326822a7565fc7764fd9957a7
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Mon Mar 16 02:16:38 2020 +0100

    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.
---
 doc/guix.texi        | 2 +-
 gnu/services/web.scm | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 28808b0..202d134 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 3edc751..ac247ec 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Marius Bakke <address@hidden>
 ;;; Copyright © 2019 Florian Pelz <address@hidden>
 ;;; Copyright © 2020 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2020 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; 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