Subject: bug#40515: closed (Re: [PATCH] services/web: Fix ordering of default-nginx-config.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 08 Apr 2020 23:17:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
40515: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=40515
GNU Bug Tracking System
Contact [email-masked] with problems

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

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.

Subject: [PATCH] services/web: Fix ordering of default-nginx-config.
From: Florian Pelz <[email-masked]>
To: [email-masked]
Cc: Florian Pelz <[email-masked]>
Date: Wed, 8 Apr 2020 23:23:45 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

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 <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Christopher Baines <[email-masked]>
 ;;; Copyright © 2018 Marius Bakke <[email-masked]>
-;;; Copyright © 2019 Florian Pelz <[email-masked]>
+;;; Copyright © 2019, 2020 Florian Pelz <[email-masked]>
 ;;; Copyright © 2020 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
@@ -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