guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: services/web: Fix ordering of default-nginx-confi


From: guix-commits
Subject: branch master updated: services/web: Fix ordering of default-nginx-config.
Date: Wed, 08 Apr 2020 19:13:45 -0400

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

pelzflorian pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 543516e  services/web: Fix ordering of default-nginx-config.
543516e is described below

commit 543516ed0040df28eb15ea9b15ce905c038671c5
Author: Florian Pelz <address@hidden>
AuthorDate: Wed Apr 8 23:23:45 2020 +0200

    services/web: Fix ordering of default-nginx-config.
    
    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 9ae84dd..dcbe6ee 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2018 Pierre-Antoine Rouby <address@hidden>
 ;;; Copyright © 2017, 2018, 2019 Christopher Baines <address@hidden>
 ;;; Copyright © 2018 Marius Bakke <address@hidden>
-;;; Copyright © 2019 Florian Pelz <address@hidden>
+;;; Copyright © 2019, 2020 Florian Pelz <address@hidden>
 ;;; Copyright © 2020 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <address@hidden>
 ;;;
@@ -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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]