From patchwork Wed Apr 8 21:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 21171 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2A7BC27BBE4; Wed, 8 Apr 2020 22:26:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E1AA427BBE1 for ; Wed, 8 Apr 2020 22:26:23 +0100 (BST) Received: from localhost ([::1]:40750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMIDH-0002T3-Fp for patchwork@mira.cbaines.net; Wed, 08 Apr 2020 17:26:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45603) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMIC2-0001vz-Vf for guix-patches@gnu.org; Wed, 08 Apr 2020 17:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMIC0-0001rs-Rb for guix-patches@gnu.org; Wed, 08 Apr 2020 17:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41413) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMIBx-0001ql-W4 for guix-patches@gnu.org; Wed, 08 Apr 2020 17:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jMIBx-0001eZ-RE for guix-patches@gnu.org; Wed, 08 Apr 2020 17:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40515] [PATCH] services/web: Fix ordering of default-nginx-config. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Apr 2020 21:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40515@debbugs.gnu.org Cc: Florian Pelz X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15863810796314 (code B ref -1); Wed, 08 Apr 2020 21:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2020 21:24:39 +0000 Received: from localhost ([127.0.0.1]:52959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jMIBV-0001df-E9 for submit@debbugs.gnu.org; Wed, 08 Apr 2020 17:24:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:44814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jMIBT-0001dU-1x for submit@debbugs.gnu.org; Wed, 08 Apr 2020 17:24:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45544) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMIBR-0001Ts-La for guix-patches@gnu.org; Wed, 08 Apr 2020 17:24:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMIBQ-0001QH-FI for guix-patches@gnu.org; Wed, 08 Apr 2020 17:24:29 -0400 Received: from pelzflorian.de ([5.45.111.108]:43694 helo=mail.pelzflorian.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jMIBP-0001P8-WF for guix-patches@gnu.org; Wed, 08 Apr 2020 17:24:28 -0400 Received: from florianmacbook.fritz.box (ip5b42d6e2.dynamic.kabel-deutschland.de [91.66.214.226]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 5F7A6360566; Wed, 8 Apr 2020 23:24:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1586381066; bh=PUXCs1T09GqSzZL2tjfvNEbtaqjz4CIy7mFEA3ypJBg=; h=From:To:Cc:Subject:Date; b=0Qe4+TdbPMiY+U/oxVQ9u6KZ2Xtni3iNRUX1w0mWrv66hTh6YPNycXJrb1HWRJGFO +si98GoI/YI9mCDlBF9hesBZgDlgLfWrMJEc7O2XFTZYvTFS1ArQ8W1PSTcHbz/P9o R4muDlxtAKLufWpNT5eTsiemOPOTxtLUpv5qMfCw= From: Florian Pelz Date: Wed, 8 Apr 2020 23:23:45 +0200 Message-Id: <20200408212346.11665-1-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 ;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; @@ -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"