From unknown Thu Jun 19 16:13:17 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#71673 <71673@debbugs.gnu.org> To: bug#71673 <71673@debbugs.gnu.org> Subject: Status: [PATCH] services: nginx: Print extra-content before the server-blocks. Reply-To: bug#71673 <71673@debbugs.gnu.org> Date: Thu, 19 Jun 2025 23:13:17 +0000 retitle 71673 [PATCH] services: nginx: Print extra-content before the serve= r-blocks. reassign 71673 guix-patches submitter 71673 Tomas Volf <~@wolfsden.cz> severity 71673 normal tag 71673 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 20 07:16:18 2024 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= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 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> To: guix-patches@gnu.org Subject: [PATCH] services: nginx: Print extra-content before the server-blocks. 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 06 11:40:38 2024 Received: (at 71673) by debbugs.gnu.org; 6 Oct 2024 15:40:39 +0000 Received: from localhost ([127.0.0.1]:41976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxTN8-0000DH-Jr for submit@debbugs.gnu.org; Sun, 06 Oct 2024 11:40:38 -0400 Received: from wolfsden.cz ([37.205.8.62]:60422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxTN4-0000D2-UT for 71673@debbugs.gnu.org; Sun, 06 Oct 2024 11:40:36 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6BDEB31D0EF; Sun, 6 Oct 2024 15:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728229227; bh=VT8lJU2CP5w3v8ifCHxlv5WCcr70nJo69yzY74Qjk+g=; h=From:To:Cc:Subject:Date; b=lRWQBI3G7fLji0vOG0X+TviDJQxvK+jCrwhrr8gpwP6c6253syBxJL7jd4xpFEgvR QsMEioRDv0Oh9cdgl/5+bezKvk5ulKnN3fTkMLl2kze1wVvalMcTe3Q28EKbRBmhaw G/srEydPKz83LpoiZ9w560znmwnu7UQ/tGX5StZyhQzIhsCk+CISOcgN3foOEPeSXz 3s3IdknxU4nfy5cSXCK6Nuzs0nik++VebIKzicxp7bfoXMLj+fd3o5sbOgKXqPjtQ8 xLWPMA2k5XHq65U5tPicuDX5/EKqdhpxMo+WsAVZJ/5VKhWdXj0TA9KyNcDR4qJqA4 65eEu2WxBAqKnE+Fdt0N/B4Q4bsoyxnqJhIjc1iW+68+ve6sw7qbhopMUwd4MoDrkG VjoN/UphmHDLQzBmCslZ27dxItBYhS1lWVJD8bVMVMKNnR4nN3a8GSvwPrgaE07bdG G8Z1ngZS24+IskdOe4AQI3OfpJevKTbli3NQN2Nu5EMFsz6fb0Vv0WRItqz7tnUXbc FH9ituzJ+OJvZg5yGM23ocKHeMWRm8b0FytXlBpVkl5QfjrtFomZwjP3Vj4s1/2VSa +zNdRwfrVMzKZgS6FCGk4K67ePX6SHrETOxcZ9IK00YOcCYPdFBbExEtnN0/SvLnwy 5DUExRDnhFImP652KtOXbxqc= X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 8483431EB9C; Sun, 6 Oct 2024 15:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728229226; bh=VT8lJU2CP5w3v8ifCHxlv5WCcr70nJo69yzY74Qjk+g=; h=From:To:Cc:Subject:Date; b=DXJWLRMx+3WYmJtPVrUC8J6NBJJtu3icuSjrJut62Xlh9RxPleWkTmgNY9WVbxNah 3k/fk5jAMUVQZfTmhA74PmCXHF2Qyy4UXrZQpDnjXh2vljTJpEDXXeVFRyVPYjuzN0 ZY2o+BT5geQetM7c+Iv/heKnY4He7t7CuTy78FwxugMOkRdTKaWeVfnyUm+1hUryYJ iX2jwZQxjJ4yqZE34HtAMXZsQOi7JkxWm71I5IXoeUHtEnJLUF6zRKfkWvIN+l0t5O WbMjjps0v6M3Cgotal9FoT0x75vUgN7+ram5oEE9IKbWE7YpuKoTfE3jOY12GkSneX rJz/2dTzyPN0Evd0tg8jM/qUlPnzxQ9BIDKXJQhqmujsX1s9s4E/5chItvNMHqgW6r HSzzXlpi0TBlgnukbaLlb1O1BL7HkyVc+uYZ4JKoSvwHp491g0MmS8knA3MjpKSAsy xiwSQbyAWy7sDdVn1XZP2MbwlDQcGawY9CCmPVS7iP2nXgkLHsl0uZv7K1K8O7PMmd OJjI8XKkQ7M7BGaKFKmTz8LIWZCf9skFooRZIJoIQyoMSaPAOK85stiEB7yMJ/2PTE d/JGZ829LUHj/maqvMbfd5HCiI80RJ+A2/1MAb7vyfU0O3Th8yOKitnYcEEBZrVueU eg+Qp/rkzqGP4qPbIORgVZuk= From: Tomas Volf <~@wolfsden.cz> To: 71673@debbugs.gnu.org Subject: [PATCH v2] services: nginx: Print extra-content before the server-blocks. Date: Sun, 6 Oct 2024 17:40:14 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71673 Cc: Tomas Volf <~@wolfsden.cz> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 --- Rebase on latest master. gnu/services/web.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index cc6f4e6d9b..84ce88aa80 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -770,10 +770,7 @@ (define (default-nginx-config config) (number->string server-names-hash-bucket-max-size) ";\n") "") - "\n" - (map emit-nginx-upstream-config upstream-blocks) - (map emit-nginx-server-config server-blocks) - (match extra-content + (match extra-content ((? list? extra-content) (map (lambda (line) `(" " ,line "\n")) @@ -781,7 +778,10 @@ (define (default-nginx-config config) ;; XXX: For compatibility strings and gexp's are inserted ;; directly. (_ extra-content)) - "\n}\n")))) + "\n" + (map emit-nginx-upstream-config upstream-blocks) + (map emit-nginx-server-config server-blocks) + "}\n")))) (define %nginx-accounts (list (user-group (name "nginx") (system? #t)) -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 20 17:39:35 2024 Received: (at 71673-done) by debbugs.gnu.org; 20 Nov 2024 22:39:35 +0000 Received: from localhost ([127.0.0.1]:48161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDtME-0004L9-Pj for submit@debbugs.gnu.org; Wed, 20 Nov 2024 17:39:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDtMC-0004Kv-E8 for 71673-done@debbugs.gnu.org; Wed, 20 Nov 2024 17:39:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDtM7-0000B6-1t; Wed, 20 Nov 2024 17:39:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=2ZuI6dDfkM8OsNcHCgcDxuNzCaLo5nD1Ro1Qc8LHsLU=; b=evPHuL8duOQtsm7+dIj4 mGRAeptWEqCKXFzzdWQROoTR8pEXDds79Rn05F2UHdOdxrHlqCHs2Kfe2/HtvywhBttEbdirchWAx Xzo3clCPgnhA/NU9NPHEEcqE8OtpFhxzrkIF2BpHa7DaB++gih1SZ8/f4HCanGsSRdE8WHc6Rhw80 HIVxeL7ni9LMfc1IwtwPqpSvMX5g/qzdhX3ToFflctR1BXVjbtQT2h/HCdlGQ4xZUjmuw9cCmnOj7 bT0e06SfxuzP9Lw4ip4Faryb+HnJzRxcXkdd+4wQFoYCHDbXOBGMjivRDMFFu8JVlYsTLy78il49v KiX6J/NbtZPblw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#71673] [PATCH v2] services: nginx: Print extra-content before the server-blocks. In-Reply-To: (Tomas Volf's message of "Sun, 6 Oct 2024 17:40:14 +0200") References: Date: Wed, 20 Nov 2024 23:39:24 +0100 Message-ID: <87r075ttr7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 71673-done Cc: 71673-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Tomas Volf <~@wolfsden.cz> skribis: > 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 Applied, thanks! From unknown Thu Jun 19 16:13:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 19 Dec 2024 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator