futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

services: nginx: Fix broken default configuration.

Browse Source 
* gnu/services/web.scm (nginx-configuration): Emit an empty events{}
block by default.
* doc/guix.texi (Web Services): Document it.
This commit is contained in:
Tobias Geerinckx-Rice 2020-03-16 02:16:38 +01:00
parent 8bbbbb3935
commit 2ec4607863
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -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.

4
gnu/services/web.scm
View File

@ -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