From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eCxTIbsPdGbQLQEAqHPOHw:P1 (envelope-from ) for ; Thu, 20 Jun 2024 11:17:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eCxTIbsPdGbQLQEAqHPOHw (envelope-from ) for ; Thu, 20 Jun 2024 13:17:15 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=rVAVAmAx; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=UmZPAgkl; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718882235; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=5UZHmZ6V/F5Q1NkKGkMHODDwxtlZZ40I+BnK/EbPf5M=; b=hIUxbgUh/WtdCCV1zZKLpajuDzscYcm9pkP5yswweiwxjqNROrwUW68HsA5Tfs8Hje2mMr o4ew8kEAixy3cgz9rcM7Yu1CNLsHOYpdqGX/xLkSNV6pS4jInJ58iFDcmFbW/7zRPJGAOk zojUR89LyL/8/NXMfG/WDJ1Rtjf4qYQoOfL4xWpNVcGCM5FRd1gf1cb5e1eq/juFA3Jjd2 LAmDXIeQws5qM5LxzIYVEJOP+2r4r/IhcZpki1Xp3Z5znW+yLg2P6WnWtDE21ZMw6AZkQr 4vN9AZ08sEMZU4ilSZyLUzbuOf5idKOooyYGvEg4al8Nr4QYk415locvrCN+BA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=rVAVAmAx; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=UmZPAgkl; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718882235; a=rsa-sha256; cv=none; b=r1sy66cALs9J4drx0/DxUhgkPSVgiuAYDPXzgULleyijJGLQSNzD0xNANuCt6IA0IEnIc0 PDMtq1e3K0tH9Q2BkdfA7PwyAI8CIQbf5oc94c8Kp+ThYkRfZvsd67XdWwrqFINq6HdPZz 6kxtjgtQGIKn3Bi4pMNtv+U2a7yE4naxW8PYqWQaoCsrxLvoaVeRpfKrtzU0fyglOY9bxD vxO4drEOliKEnK8oGd/8ts87fg77xaI/mgOmnU6m21OTWVpziko4ej8G78tAzeMfiXdyFw m2DTFEu3ms6crIxPb3Inz2u0EwpisupFxR8YPvMG8H++x0u6cGAir86HFUsS4g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 22CEB703E2 for ; Thu, 20 Jun 2024 13:17:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKFmm-0006Bx-7l; Thu, 20 Jun 2024 07:17:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKFmk-0006AA-Cf for guix-patches@gnu.org; Thu, 20 Jun 2024 07:16:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sKFmk-0003sz-4j for guix-patches@gnu.org; Thu, 20 Jun 2024 07:16:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKFmn-0001LJ-TN for guix-patches@gnu.org; Thu, 20 Jun 2024 07:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71673] [PATCH] services: nginx: Print extra-content before the server-blocks. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jun 2024 11:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71673 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71673@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17188821785083 (code B ref -1); Thu, 20 Jun 2024 11:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jun 2024 11:16:18 +0000 Received: from localhost ([127.0.0.1]:52853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKFm6-0001Jv-8q for submit@debbugs.gnu.org; Thu, 20 Jun 2024 07:16:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:34024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sKFm4-0001Jk-2q for submit@debbugs.gnu.org; Thu, 20 Jun 2024 07:16:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1sKFlz-00066Q-QR for guix-patches@gnu.org; Thu, 20 Jun 2024 07:16:12 -0400 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1sKFlw-0003jy-2P for guix-patches@gnu.org; Thu, 20 Jun 2024 07:16:11 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 127EB298634; Thu, 20 Jun 2024 11:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718882164; bh=3otJ77y3ILz484cRA7QnlPcc4g9HZMFhnR3WYjO6iU0=; h=From:To:Cc:Subject:Date; b=rVAVAmAxqJZKQcq//nJ5xhdOonnVMSbUoKyXbbPdXKP8xNlrYhD44gYG4KjJ1IF+K BxpCRCuhvGEG01+AtWpZirnY8ld03stxjVoQcxaP53n2mNs3ErxZW5R7iHWOEWeVXa rTnB2Wfn+3UOCegJ61E0QK/1T3lPvquqIP44nm7d4e12lTUh5c4DJiYA5dNqNf3qdo DRXcL2r5Veyg1vqP40YU+8gIO8DCmcVPBfWJZPQSP7H1Bup5PJFVFVQHlxt1cP6k76 7xUoa2ylMrJG61AoYscmKfR2zFj+nQa4tSwVkMly7BQZ2LDX9Ofg0xM/Id3f5r+h8v q/DPej6DeASopAqOtNf6BzEkPGg7mB+WSN91QXZHjYKW/VjMRa4xUpnChgzSMnSF77 DtoJo7+LRCp+yO+765Pm6YQthsFpRqia3izK9GoNA7UwOqoMgu/ee2GTCjDCqnLy7A xYm1+rEnkRlmp0EcTdvptVDOIALL2X15zmarQDlvvnhbxy6ii8hwk+29XszNM5x0kh LMZCgak/QWjc3+dBTWl1BnK+tfJfCoeiCilIfhLtSuW5JmNGO2xu7dgVrotIvhQ5+T c2qUYSIpmP6Dh63KUFxl/vgDiCVKI7iZceVs104Bw8IVHWhtB1IOOxwErrZjn0UTFk vkoLjANwpmCQFxOtfNbZ7GBo= Received: from localhost (unknown [146.70.134.164]) by wolfsden.cz (Postfix) with ESMTPSA id EE29A29B9E4; Thu, 20 Jun 2024 11:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718882163; bh=3otJ77y3ILz484cRA7QnlPcc4g9HZMFhnR3WYjO6iU0=; h=From:To:Cc:Subject:Date; b=UmZPAgklKCY1F47L4dna8cieGWiLYz2arpSiGwfJnXny7OcLKxKvZe4Wa3aWwlKak 49NK7eQ2W3WtcnK8Ycdxq7djDQR0uQzFYeG/ajv4YM8RGbTQ1W5E/tRmpgIQ1viazF mgCLKvg3MVF6naZUUZ3BSGA8GV4zOEjnLUK0YNqUSco29FcallSJKxPi+Ltzv4DWzU 5s2xJOnW6SBpRkA0qQJtRSt5imTYeha823parwmJEbTzP9wSNggykWU5BJtkoxhdZD SXLuC01am5qOHrJm3aJInMWxLV6BR8TTm+0GZu/xWaMYypVPWkqwg/jL34IeFRomLo hDowjjpL6vK4+tsyA+VB7PXuk5nQ9rxZyqZjW+pfiz7YZOrujO5PXPJI0PEV1Nt6gA 5JY5Ec6AJjQx1P4juAi1VVu7MD+dxsVexJ/kD2ybbS6oh+sz551TJAHphC9plIwuWc v4uG/QDQzgikAW1/LSFzXOhCCvohTl2mHKMPTK85HSR6Qo91Zy52q4yWto7Chfrq+M aqyaQ+ljPNiP+7duYriF0c15rsD73LPmyTsfHCwUG93P3EhA8TxndobY+lRTHDpBGS B1NvNIpOP7Ue70s8Gi3jfoItFbxpf0sQQ6g0GZAp6jl1yEwZnC7CKihv05i6+OTK5/ CkGTn9m2Di5ShJbwuZnVm9y8= From: Tomas Volf <~@wolfsden.cz> Date: Thu, 20 Jun 2024 13:14:48 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 3.94 X-Migadu-Queue-Id: 22CEB703E2 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 3.94 X-TUID: alItMYvgOGPq The configuration file is processed sequentially, which meant that there was no way to set for example log format shared between the server-blocks, because the final configuration file would have this order: ... http { ... server { } ... $extra-content } Moving the extra-content before the serialization of server-blocks resolves this. * gnu/services/web.scm (default-nginx-config): Move extra-content before server-blocks. Change-Id: Ie8286a533dfed575abc58a0f4800706b3ad6adc2 --- While this I assume *could* be considered a backwards incompatible change, I cannot really think of anything that it would break. 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 406117c457..e3887d0ed8 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -768,11 +768,11 @@ (define (default-nginx-config config) (number->string server-names-hash-bucket-max-size) ";\n") "") + extra-content "\n" (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) - extra-content - "\n}\n")))) + "}\n")))) (define %nginx-accounts (list (user-group (name "nginx") (system? #t)) -- 2.45.1