unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#40515] [PATCH] services/web: Fix ordering of default-nginx-config.
@ 2020-04-08 21:23 Florian Pelz
  2020-04-08 23:16 ` bug#40515: " pelzflorian (Florian Pelz)
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Pelz @ 2020-04-08 21:23 UTC (permalink / raw)
  To: 40515; +Cc: Florian Pelz

Fixes an error message '"load_module" directive is specified too late'.

* gnu/services/web.scm (default-nginx-config): Emit load_module before
global directives.
---
 gnu/services/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 9ae84ddbc4..dcbe6ee16f 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
@@ -652,8 +652,8 @@ of index files."
            "user nginx nginx;\n"
            "pid " run-directory "/pid;\n"
            "error_log " log-directory "/error.log info;\n"
-           (map emit-global-directive global-directives)
            (map emit-load-module modules)
+           (map emit-global-directive global-directives)
            "http {\n"
            "    client_body_temp_path " run-directory "/client_body_temp;\n"
            "    proxy_temp_path " run-directory "/proxy_temp;\n"
-- 
2.26.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#40515: [PATCH] services/web: Fix ordering of default-nginx-config.
  2020-04-08 21:23 [bug#40515] [PATCH] services/web: Fix ordering of default-nginx-config Florian Pelz
@ 2020-04-08 23:16 ` pelzflorian (Florian Pelz)
  0 siblings, 0 replies; 2+ messages in thread
From: pelzflorian (Florian Pelz) @ 2020-04-08 23:16 UTC (permalink / raw)
  To: 40515-done

On Wed, Apr 08, 2020 at 11:23:45PM +0200, Florian Pelz wrote:
> Fixes an error message '"load_module" directive is specified too late'.

Actually I tested and am confident enough, so I pushed as
543516ed0040df28eb15ea9b15ce905c038671c5.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-04-08 23:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-08 21:23 [bug#40515] [PATCH] services/web: Fix ordering of default-nginx-config Florian Pelz
2020-04-08 23:16 ` bug#40515: " pelzflorian (Florian Pelz)

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).