GNU bug report logs - #40515
[PATCH] services/web: Fix ordering of default-nginx-config.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 40515 in the body.
You can then email your comments to 40515 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Florian Pelz <pelzflorian <at> pelzflorian.de>
To: guix-patches <at> gnu.org
Cc: Florian Pelz <pelzflorian <at> pelzflorian.de>
Subject: [PATCH] services/web: Fix ordering of default-nginx-config.
Date: Wed,  8 Apr 2020 23:23:45 +0200

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 <at> inria.fr>
 ;;; Copyright © 2017, 2018, 2019 Christopher Baines <mail <at> cbaines.net>
 ;;; Copyright © 2018 Marius Bakke <mbakke <at> fastmail.com>
-;;; Copyright © 2019 Florian Pelz <pelzflorian <at> pelzflorian.de>
+;;; Copyright © 2019, 2020 Florian Pelz <pelzflorian <at> pelzflorian.de>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me <at> 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

Message #10 received at 40515-done <at> debbugs.gnu.org (full text, mbox):

From: "pelzflorian (Florian Pelz)" <pelzflorian <at> pelzflorian.de>
To: 40515-done <at> debbugs.gnu.org
Subject: Re: [PATCH] services/web: Fix ordering of default-nginx-config.
Date: Thu, 9 Apr 2020 01:16:46 +0200

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.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.