From unknown Sat Jun 21 10:43:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71586] [PATCH] services: web: Improve nginx formatting for extra-content Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Jun 2024 03:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71586@debbugs.gnu.org Cc: Richard Sent X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171851032814087 (code B ref -1); Sun, 16 Jun 2024 03:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2024 03:58:48 +0000 Received: from localhost ([127.0.0.1]:47335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIh2V-0003f8-9v for submit@debbugs.gnu.org; Sat, 15 Jun 2024 23:58:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:56508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIh2T-0003ew-OI for submit@debbugs.gnu.org; Sat, 15 Jun 2024 23:58:46 -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 1sIh2S-0004sN-8x for guix-patches@gnu.org; Sat, 15 Jun 2024 23:58:44 -0400 Received: from mail-108-mta114.mxroute.com ([136.175.108.114]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sIh2Q-0004ql-Mu for guix-patches@gnu.org; Sat, 15 Jun 2024 23:58:44 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta114.mxroute.com (ZoneMTA) with ESMTPSA id 1901f326ad900017a3.001 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 16 Jun 2024 03:58:36 +0000 X-Zone-Loop: 78efd3c53ad4f806480fb3a1793e28fa3eb639d70e67 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AkMdTTgEwpAb3Kgd6Us9jBm7QxzvrbcitY5lCjkVkqI=; b=GM7Oburvzi2v1K9/f8KOFPj97j 1eD5evZ5m5jy5a4rndpiGdC5wOfdn5PucBIJ20JhHZ58m6+mv0qm2wa4Pc02n8ff1GyeHdCfih9mP zhCMLyQ8Wzk3s/6Pa1ahvXNIP91vadc0CSgsRVs+ivVaijQ6AH3tUGecc0LI9JFVQVDsgZlEtrL4y YSWWOB6Wb35wWtTZc4pVtKSE2ppOpCNPMzzAiZlGt5TfP8ZV1//oXSdELNE5D2l/o901Bj32/JE3w XxFnjySotXxwjWOYmhajq9wRfhNW+KnN+9PNKfwWLzjDKpa8v5T2VHwetSipG08rFZYBQCNxw91Vh qs8Tjb1A==; From: Richard Sent Date: Sat, 15 Jun 2024 23:57:12 -0400 Message-ID: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com Received-SPF: pass client-ip=136.175.108.114; envelope-from=richard@freakingpenguin.com; helo=mail-108-mta114.mxroute.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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.4 (--) * gnu/services/web (default-nginx-config): When extra-content is a list, add 4 space indentation and a newline to every line. If it's a string, continue inserting it directly. This makes the list serialization behavior more consistent with other services. Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a --- gnu/services/web.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..094b1e4b45 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -771,7 +771,12 @@ (define (default-nginx-config config) "\n" (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) - extra-content + (match extra-content + ((? string? extra-content) extra-content) + ((? list? extra-content) + (map (lambda (line) + (simple-format #f " ~A\n" line)) + extra-content))) "\n}\n")))) (define %nginx-accounts base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280 -- 2.45.1 From unknown Sat Jun 21 10:43:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71586] [PATCH] services: web: Improve nginx formatting for extra-content Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 17:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Richard Sent Cc: 71586@debbugs.gnu.org X-Debbugs-Original-Cc: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17188197406013 (code B ref -1); Wed, 19 Jun 2024 17:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jun 2024 17:55:40 +0000 Received: from localhost ([127.0.0.1]:53325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJzX2-0001Yt-8j for submit@debbugs.gnu.org; Wed, 19 Jun 2024 13:55:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:57194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sJzX0-0001Yh-BG for submit@debbugs.gnu.org; Wed, 19 Jun 2024 13:55:39 -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 1sJzWw-0005zj-Fp for guix-patches@gnu.org; Wed, 19 Jun 2024 13:55:34 -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 1sJzWt-0008Tj-PK for guix-patches@gnu.org; Wed, 19 Jun 2024 13:55:34 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id E622C29BD4F; Wed, 19 Jun 2024 17:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718819720; bh=/EC9HwODS7sQStqLo6Q05W0tuJXZS+GQ5zbMUjwYbqI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=P8d/+pHh7Leh0BlzMpNy4WMC14jo1yeRpxz8pDJ0+UPkOo+OGwthEZ/3vTlJTW81O PCduZNGzsv+zSp8wghJQj1BHXQwYrqhImgElD4LngfOWf57D5HB2OO7F73l5vPU+eZ +N8PxGX6x+OZxg4kXfY2OPoh1jGd8Vf1oHxV1seWg2pEBsA1du/rjoArfmHIG8wnUP k8Xeyn1/swLEh4XmUvmkeWyn8mvIqsvpzPEnzt3gnjnl7Emo1f+SV6XfAIqU7J6Q1h qKUs+suiwRBr9IBggAhTFSqaKvPzewF8BzbvmRqvYYsW8W7bxVCaMGCnTgniTf5KUi FnteZ5a/S02ZCWsbsW8hgamcgCn8YUq02vItjcvkgdxrBfw42sQJPF+29hZhtpslK5 Av1rUvhCxbXKhoxPMWTJ2x0OgKd4IvnVoWgo/5OtDEP+srTu9rl/rNOB+DlsD78Lsq 46pJguFxSbmfRIwzoreLM9eTuUdp62A1fTVXQJEsyVW0WOvxNOrWtqbxp3zTOwnMtM lHXQKfUHQRlYe040YEUqD4gUhMDaw3TKW+9de1mr2NZTxzks9QoyC3IqjO7ZNHvZXg 4Y7F491INwqH/sLVNbcZW0dsSYwmqGJ0B8F4unvxcM17GplUF6sezTxcqhvbExWs25 LKdxIxnzlFew70U2pGYUI3G4= 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 [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id E745729ADE6; Wed, 19 Jun 2024 17:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718819720; bh=/EC9HwODS7sQStqLo6Q05W0tuJXZS+GQ5zbMUjwYbqI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=P8d/+pHh7Leh0BlzMpNy4WMC14jo1yeRpxz8pDJ0+UPkOo+OGwthEZ/3vTlJTW81O PCduZNGzsv+zSp8wghJQj1BHXQwYrqhImgElD4LngfOWf57D5HB2OO7F73l5vPU+eZ +N8PxGX6x+OZxg4kXfY2OPoh1jGd8Vf1oHxV1seWg2pEBsA1du/rjoArfmHIG8wnUP k8Xeyn1/swLEh4XmUvmkeWyn8mvIqsvpzPEnzt3gnjnl7Emo1f+SV6XfAIqU7J6Q1h qKUs+suiwRBr9IBggAhTFSqaKvPzewF8BzbvmRqvYYsW8W7bxVCaMGCnTgniTf5KUi FnteZ5a/S02ZCWsbsW8hgamcgCn8YUq02vItjcvkgdxrBfw42sQJPF+29hZhtpslK5 Av1rUvhCxbXKhoxPMWTJ2x0OgKd4IvnVoWgo/5OtDEP+srTu9rl/rNOB+DlsD78Lsq 46pJguFxSbmfRIwzoreLM9eTuUdp62A1fTVXQJEsyVW0WOvxNOrWtqbxp3zTOwnMtM lHXQKfUHQRlYe040YEUqD4gUhMDaw3TKW+9de1mr2NZTxzks9QoyC3IqjO7ZNHvZXg 4Y7F491INwqH/sLVNbcZW0dsSYwmqGJ0B8F4unvxcM17GplUF6sezTxcqhvbExWs25 LKdxIxnzlFew70U2pGYUI3G4= Date: Wed, 19 Jun 2024 19:55:17 +0200 From: Tomas Volf <~@wolfsden.cz> Message-ID: References: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="XF0M5j9EUVO0UX5v" Content-Disposition: inline In-Reply-To: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> 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-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 (--) --XF0M5j9EUVO0UX5v Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, On 2024-06-15 23:57:12 -0400, Richard Sent wrote: > * gnu/services/web (default-nginx-config): When extra-content is a list, add 4 > space indentation and a newline to every line. If it's a string, continue > inserting it directly. This makes the list serialization behavior more > consistent with other services. > > Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a > --- > gnu/services/web.scm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/gnu/services/web.scm b/gnu/services/web.scm > index 406117c457..094b1e4b45 100644 > --- a/gnu/services/web.scm > +++ b/gnu/services/web.scm > @@ -771,7 +771,12 @@ (define (default-nginx-config config) > "\n" > (map emit-nginx-upstream-config upstream-blocks) > (map emit-nginx-server-config server-blocks) > - extra-content > + (match extra-content > + ((? string? extra-content) extra-content) > + ((? list? extra-content) > + (map (lambda (line) > + (simple-format #f " ~A\n" line)) The format here sadly prevents producing `include' directives with link to the store, since any file-like object will be just serialized as its representation: `("foo" "bar" ("aa" "bb") ,(plain-file "foo" "baz")) Will end up as: foo bar (aa bb) #< name: "foo" content: "baz" references: ()> Neither the list nor the plain-file are as expected. What about doing just this: (match extra-content ((? string? extra-content) extra-content) ((? list? extra-content) (map (lambda (line) `(" " ,line "\n")) extra-content))) This produces the expected (in my opinion) output: foo bar aabb /gnu/store/7pz4iczjvgvn9ikpp1ip50bk6vi4sk7b-foo Meaning you can now do things like (extra-content `(("include " ,%some-file.conf ";"))) And it will work as expected. It already works like this for raw-content in the nginx-server-configuration. Thoughts? > + extra-content))) > "\n}\n")))) > > (define %nginx-accounts > > base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280 > -- > 2.45.1 > > Have a nice day, Tomas Volf -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --XF0M5j9EUVO0UX5v Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmZzG4UACgkQL7/ufbZ/ wamKKQ/+I4PpctYqrA3G0BWHyfraxDRURbMC0AyyHg6I03+6YF0zBh4g7RMoouZt jLrd9vNgKcArEHzAQcgWJe6I44bh0W5V8ppE459NpACOfjjXdABg+KZ2lb5g69FR p4PnosamM9Njh50I4mwVAdA/E2Xjp4f5Iog2369sjotDUDBErd+JUVGSshw0dmjf i/BhrW2UJQDHtUbPwCB2e34QsLOiMKxaKQmsbmBd5DETZASWm7khHNpYEURDFqdZ BJeDgZ8KhulRmpj25DCAxwMuN4A93tBuRR6b0j6jEWBbc6/Iq0z64KyIOSOZ8I9h WPd4pQFYApYpNUEjvAtwJwQIBsh4i185yuWynwmMVpaMf7xPa2bLD1tj3JZiZ2cB bqRIHuCtIQtbpcsCpEo89NkoWORIUGXV7nPF81Uv5SwUm8EIzfFw9xHS7OnuQ0un HNO7DUknmWpy2zVuuQ4otrUbMtTR6/plAYRJ4VUm6+c+xkWWkyMhjyD4ivvIdybS B3VCBbIvQ+R9FHnHWnbMc0Wvc6gRlVZlxzlaFU4uoCmMvgfssxbjLk/I/YmqfZS1 w0dDMVHGB3T8alm/5AVmbiZr9lSlUK6e9TJkXplUM+4wjOXl+vNcMKIFohr6GBU6 w51WurOxFA6Phkvj+GKnMZgD14jToXE2Q3Og2Qdx7LbQbcWHn3w= =c0Rs -----END PGP SIGNATURE----- --XF0M5j9EUVO0UX5v-- From unknown Sat Jun 21 10:43:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71586] [PATCH v2] services: web: Improve nginx formatting for extra-content References: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> In-Reply-To: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2024 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71586@debbugs.gnu.org Cc: Richard Sent , ~@wolfsden.cz Received: via spool by 71586-submit@debbugs.gnu.org id=B71586.171882325914088 (code B ref 71586); Wed, 19 Jun 2024 18:55:02 +0000 Received: (at 71586) by debbugs.gnu.org; 19 Jun 2024 18:54:19 +0000 Received: from localhost ([127.0.0.1]:55180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK0Rn-0003fA-7v for submit@debbugs.gnu.org; Wed, 19 Jun 2024 14:54:19 -0400 Received: from mail-108-mta29.mxroute.com ([136.175.108.29]:41253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sK0Rl-0003ew-N2 for 71586@debbugs.gnu.org; Wed, 19 Jun 2024 14:54:18 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta29.mxroute.com (ZoneMTA) with ESMTPSA id 19031d9719800017a3.001 for <71586@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 19 Jun 2024 18:54:12 +0000 X-Zone-Loop: df1c812095af92ceeccb9e14fb2fded7593e0e57099c X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dyOeKPwytSjInHziwe+fqzWHCAzn2QTiW2sYtxZh+0o=; b=rF+yZntfvGoc4n3RsEWts2LoWE aORbWCNH84zDRbYRA+PcCU856m8MrsvtSbnsEGhw3zrrSzrZ0/Iwzz+LHhpKS7ol5x+22Mom2+8oB GfhS6K4OSFLhFyolKaTrSREk6hXi7qHzDqalnTFH3j98LE2xsXCaPhUXD4Lok9xIjLhc1yvQP8UQ3 b9IsZiO5+093B3918nVt78RYIZ+3UE37y5krl8cx5iYZJW23o+S3V7k1prp3nv6/JYlGcxUApO+eP gUZbLYEdyJVboCz5DlDk0y6pTqCl5GBGin8YJ1PLWgKnwm7He2T3ESSVLIJxnwnZmlSaJZ2s0ckBR IaWVX3IA==; From: Richard Sent Date: Wed, 19 Jun 2024 14:49:19 -0400 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com X-Spam-Score: -0.0 (/) 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 (-) * gnu/services/web (default-nginx-config): When extra-content is a list, add 4 space indentation and a newline to every line. If it's a string, continue inserting it directly. This makes the list serialization behavior more consistent with other services. Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a --- Updated according to feedback. I agree that file-like objects should be lowered into strings like they normally are and not serialized in their package form. emit-nginx-upstream-config has a similar issue. gnu/services/web.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..0572af1310 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -771,7 +771,12 @@ (define (default-nginx-config config) "\n" (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) - extra-content + (match extra-content + ((? string? extra-content) extra-content) + ((? list? extra-content) + (map (lambda (line) + `(" " ,line "\n")) + extra-content))) "\n}\n")))) (define %nginx-accounts base-commit: e32e3d0a03dc17c4c54a91aad053c9036998b601 -- 2.45.1 From unknown Sat Jun 21 10:43:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71586] [PATCH v3] services: web: Improve nginx formatting for extra-content References: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> In-Reply-To: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 20 Jun 2024 16:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71586@debbugs.gnu.org Cc: ~@wolfsden.cz, Richard Sent , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 71586-submit@debbugs.gnu.org id=B71586.171890178528437 (code B ref 71586); Thu, 20 Jun 2024 16:44:02 +0000 Received: (at 71586) by debbugs.gnu.org; 20 Jun 2024 16:43:05 +0000 Received: from localhost ([127.0.0.1]:35993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKKsK-0007Oa-Sw for submit@debbugs.gnu.org; Thu, 20 Jun 2024 12:43:05 -0400 Received: from mail-108-mta21.mxroute.com ([136.175.108.21]:32775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKKsH-0007Nb-NS for 71586@debbugs.gnu.org; Thu, 20 Jun 2024 12:43:02 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta21.mxroute.com (ZoneMTA) with ESMTPSA id 190368791e800017a3.001 for <71586@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 20 Jun 2024 16:42:52 +0000 X-Zone-Loop: 8b92e3f788985d292b2af80ea24512909f6b57bffd2b X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+OvG4eXF2NC5otvPliVNBbLNBcI1vh44lvEVu6m1YmQ=; b=jgQgkb1PuCmNGmR2X8fCPOWaqJ bsY1BSXERNKfKa5CC+OZjPm1ZfJ9AcXgvjWiflrm2LJvN5/HnWxe8/VGeyA32ItEFMoifh2NIrhbR ntLZZwsXRNN7kx9dKd3XV6Zify4ShOtioVgmRlgM4fDiwLEbLOqKlxJey/7s7roQts1dVP86qMRTS nhTKVl0x5kExT6NmEVORbxzORm4/1Ie8VvomjTcN2bqWEisjfb4YOcmS97Xir+k8XktacuyDzTc+5 8fX4p3JyiTdihjW+lUvAAs0T/GmvOAnbyY+jCQLWRYrBKE3Rlu6y2kWhMPUAV9RWoXC0E5Y5Opl+f kwS5Y4JQ==; From: Richard Sent Date: Thu, 20 Jun 2024 12:42:03 -0400 Message-ID: <3dd76c96b1a0dfd61fea9fb532304aff0dc2fcf8.1718901723.git.richard@freakingpenguin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com X-Spam-Score: -0.0 (/) 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 (-) When extra-content is a list, add 4 space indentation and a newline to every line. If it's a string, continue inserting it directly. This makes the list serialization behavior more consistent with other services. * gnu/services/web (default-nginx-config): Support lists. * doc/guix.texi (Web Services) [nginx-configuration]: Document it. Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a --- doc/guix.texi | 13 +++++++++++-- gnu/services/web.scm | 9 ++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0102fd0fad..48fc457627 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31907,8 +31907,17 @@ Web Services @end lisp @item @code{extra-content} (default: @code{""}) -Extra content for the @code{http} block. Should be string or a string -valued G-expression. +Additional content to be appended to the @code{http} block. Can either +be a value that can be lowered into a string or a list of such values. +In the former case, it is inserted directly. In the latter, it is +prefixed with indentation and suffixed with a newline. Nested lists are +flattened into one line. + +@lisp +(extra-content "include /etc/nginx/custom-config.conf;") +(extra-content `("include /etc/nginx/custom-config.conf;" + ("include " ,%custom-config.conf ";"))) +@end lisp @end table @end deftp diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..ee3499e5cd 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -771,7 +771,14 @@ (define (default-nginx-config config) "\n" (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) - extra-content + (match extra-content + ((? list? extra-content) + (map (lambda (line) + `(" " ,line "\n")) + extra-content)) + ;; XXX: For compatibility strings and gexp's are inserted + ;; directly. + (_ extra-content)) "\n}\n")))) (define %nginx-accounts base-commit: e32e3d0a03dc17c4c54a91aad053c9036998b601 -- 2.45.1 From unknown Sat Jun 21 10:43:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71586] [PATCH v3] services: web: Improve nginx formatting for extra-content Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jun 2024 21:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Richard Sent Cc: 71586@debbugs.gnu.org Received: via spool by 71586-submit@debbugs.gnu.org id=B71586.171891895732326 (code B ref 71586); Thu, 20 Jun 2024 21:30:02 +0000 Received: (at 71586) by debbugs.gnu.org; 20 Jun 2024 21:29:17 +0000 Received: from localhost ([127.0.0.1]:44814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKPLI-0008PK-Lw for submit@debbugs.gnu.org; Thu, 20 Jun 2024 17:29:16 -0400 Received: from wolfsden.cz ([37.205.8.62]:50554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sKPLG-0008PA-KU for 71586@debbugs.gnu.org; Thu, 20 Jun 2024 17:29:15 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9077029D4E8; Thu, 20 Jun 2024 21:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718918948; bh=Kn+BCcSNKwiBt+1AUfClwCVsigo/H7jSwOJWL0KLa/g=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=OPD80mEDASGcImGuATPEExxUuEefBdpBWmiw9rRkMM5yMzWf9tz9d8IBeRx9nmHzY 36cwe0zJvHo1R+Nu39wXmq5DTbQRgGEU4M2nxYSH+4R3Y0tEk3PcdDCBnnRZYuxeDw w523+wzfvWVTaBny0DVYKoIgXV06dcoO3ARnmBuQPiSxU0Ps6VmNpd+5/iyiXfyjRF 12q0aGAGE3SiCtPKXkdbnygTK359fAKmPpU9I9tEwgL5evxYImMCM5Fe3KGGtZ39Yp /1Q0qbaVuXzajsJgL9nlg+zezNfd1cSftsaVYty7jWvCwaD6i4n20cX99AGzbsXaEe sWl0dRKDRoo3wP4xlVUWu0j7fbvSbqgUJ/DLijsJSzdhPAamLYhRPBvSMVeKbKl3A+ O9ff0I/wmNuqdDcbeLBs5xPXvoJAGGhJnO5OYmQbjLk3mpqsny05mgpJe/ZsQtZfPn igi5y+1Qew0It0aZ+w6KYid+eN9aS1aDlFKfGqTlytt78LL0B3rUWoAre9vnnHkUjY 1wsP3e3U//C7wNwgkvK7Afdr3g0YKpA6GtsTyoeWvgMSqxwe+FWYSixas463ZZVfxa yO/Cp5lKOQazJhihHiGwDxC+PNDL/0mnlFwlbmdoqUwr1KMrzaY7OEMnAYPSxHwi4J icQyRbXcya1BKKQ6KPCnYgw4= 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 13FDC29CC77; Thu, 20 Jun 2024 21:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718918947; bh=Kn+BCcSNKwiBt+1AUfClwCVsigo/H7jSwOJWL0KLa/g=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=cyzhlcKHZhPIqtZJk1syXMrI+MBu2w81+DlTg8MtlSTwyeqYNnz1CX+w9JND6DOIv LMsTwgsnTWED2V2B5ISOkbk6IyttaoSQHPNObCePJZV9UcyzJaJFAE8sQfDAj4Q5RF UcCiwU+/rf50Hw+iIt/XYIpfY8Hb53voh+hpnbQB08ZS49kKuZ1VNgqrnAe/qnb0rZ ujbXMJOCrbImvS5GnTm2uKhSP1jP9Rgu5nbK1keRgZorbXo+wojJMi6QvIjXewbKVt YoaYTz3jtz11e0GAM63LkFOhidoHw6KlnEgoj0r7l+BI9mij9ZXGQW98IoqGkYerWh JS4VhQiNRxF9mS81VFxqy5a71GYLb1D/caB43AE7DynBDBgBikOoZ7hUN2ufqN9kq9 E6ymNW6NUkIBW4/8yBA645YBGinM//2TKbeitAlRf9S0FlG930lkBnHe37UPrhWvAK 5W+S2PwgGKNemJcWRYJy4cOtsg8Iegnd0UT+yjZ7Kyanfr0reXJ9bZMH/UeMrnyAK7 8W8Xc5MjeZUDoTGf6qSZ+ClE/xvtdG2p17zCaGytDX/ydN79POhJWturo5FyLdmq+O ddecqPhdbQYb2XaFYdKyC/xR87tUb/ydl3/PAB86llmjL/UUNL8W3y0zjFO5ci+MMD by8nWjDxbX/09/iejVtVslpo= Date: Thu, 20 Jun 2024 23:29:06 +0200 From: Tomas Volf <~@wolfsden.cz> Message-ID: References: <3dd76c96b1a0dfd61fea9fb532304aff0dc2fcf8.1718901723.git.richard@freakingpenguin.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="W+tS5ECHHaHErwSq" Content-Disposition: inline In-Reply-To: <3dd76c96b1a0dfd61fea9fb532304aff0dc2fcf8.1718901723.git.richard@freakingpenguin.com> X-Spam-Score: -0.0 (/) 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 (-) --W+tS5ECHHaHErwSq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On 2024-06-20 12:42:03 -0400, Richard Sent wrote: > When extra-content is a list, add 4 space indentation and a newline to every > line. If it's a string, continue inserting it directly. This makes the list > serialization behavior more consistent with other services. > > * gnu/services/web (default-nginx-config): Support lists. > * doc/guix.texi (Web Services) [nginx-configuration]: Document it. > > Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a Reviewed-by: Tomas Volf <~@wolfsden.cz> -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --W+tS5ECHHaHErwSq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmZ0nyIACgkQL7/ufbZ/ walT0w//dPEqc3AZBcdg7ZPEjw9RCLQszsaU9oau05vwhRralXIvr61EcegUWMHP ErFyqz4k58pqzHIHRQAXth8T+TLxhmBs++GBa6Xwqx00Ism7VPIpu/OeUigI2XQE 6hukGUIglzzyvVj8IU0J4rlfMbv9AWXFqMjVSJO79otIgcKuicKKUBW2wwVXrGJG btr965ViEJcs8NOZCtftlvKBkGUKnIipZaPZbP0Js/TiYqZaTO7ISltDoz8mU11z 2NcTeUOnak18sUAbMI1cgAQHKfVxyBTVBrns2QNSE8+nX8vyPUp4DaQRwlfhrW9l oTzkNg1kPostD7NuzL5j0bbq9rZU2lxHWmA9HlR9I8plMopsP+Wo5ZRf90V44oGy N+NsQEfVPB6wQBVFztu9Yxo3y7Feiz/T8Lhz65cdBDCvSTBMlO3I3KKfi6Jv4G/c PIdQLCwUe1/IsrETewYe68Z0f1kI3cFEzKvNC2UAxzQyKSv9GRFaR31FJV9OorlA l83CGDKUXeIDUsnVI6rrIn3MT22eQw8HN0AYBC3Zkzdaaxgq355fBnEyhWsRIIxS VZTSzZd6C4dQmNUBia2pZGLNYNDgMkemcFd7oTT/SmmHP1O8tTMjJywvFRvN02R3 qmN+/FVNDi30M9YOYP6DUuEa/kTgJfPza961CTow8w9a+5+aywg= =ZoHP -----END PGP SIGNATURE----- --W+tS5ECHHaHErwSq-- From unknown Sat Jun 21 10:43:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Richard Sent Subject: bug#71586: closed (Re: [bug#71586] [PATCH v3] services: web: Improve nginx formatting for extra-content) Message-ID: References: <87ikxu4quj.fsf@cbaines.net> <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> X-Gnu-PR-Message: they-closed 71586 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 71586@debbugs.gnu.org Date: Thu, 27 Jun 2024 10:35:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1719484502-8231-1" This is a multi-part message in MIME format... ------------=_1719484502-8231-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #71586: [PATCH] services: web: Improve nginx formatting for extra-content 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 71586@debbugs.gnu.org. --=20 71586: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71586 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1719484502-8231-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 71586-done) by debbugs.gnu.org; 27 Jun 2024 10:34:07 +0000 Received: from localhost ([127.0.0.1]:41098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMmS7-00027D-AG for submit@debbugs.gnu.org; Thu, 27 Jun 2024 06:34:07 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMmS4-000273-NS for 71586-done@debbugs.gnu.org; Thu, 27 Jun 2024 06:34:05 -0400 Received: from localhost (unknown [212.132.255.81]) by mira.cbaines.net (Postfix) with ESMTPSA id EC9B227BBE2; Thu, 27 Jun 2024 11:34:00 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 63345a16; Thu, 27 Jun 2024 10:33:59 +0000 (UTC) From: Christopher Baines To: Richard Sent Subject: Re: [bug#71586] [PATCH v3] services: web: Improve nginx formatting for extra-content In-Reply-To: <3dd76c96b1a0dfd61fea9fb532304aff0dc2fcf8.1718901723.git.richard@freakingpenguin.com> (Richard Sent's message of "Thu, 20 Jun 2024 12:42:03 -0400") References: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> <3dd76c96b1a0dfd61fea9fb532304aff0dc2fcf8.1718901723.git.richard@freakingpenguin.com> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Thu, 27 Jun 2024 11:33:56 +0100 Message-ID: <87ikxu4quj.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71586-done Cc: 71586-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: -1.0 (-) --=-=-= Content-Type: text/plain Richard Sent writes: > When extra-content is a list, add 4 space indentation and a newline to every > line. If it's a string, continue inserting it directly. This makes the list > serialization behavior more consistent with other services. > > * gnu/services/web (default-nginx-config): Support lists. > * doc/guix.texi (Web Services) [nginx-configuration]: Document it. > > Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a > --- > doc/guix.texi | 13 +++++++++++-- > gnu/services/web.scm | 9 ++++++++- > 2 files changed, 19 insertions(+), 3 deletions(-) Thanks for the patch, I forgot to close the issue yesterday but I pushed this to master as da3e71f472c2335f56c3d07758715a514fdb3a9d. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZ9QBRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcEphAAuQmbOb9Tlm0aKFoDCGq2IOhBQjpugAG0 Bt7siln55iejyaLY4udTh0RHyQ+K2TSCCa+s9p4RAdpKSpd7FXaTijFM0ZmUrfXj UZafNvITX0HE+/LMEvXAtEgXwH6RcWqGvBUDPY1/7PDsyUS+TNorfeR8PS2lkn2+ ZLu45bPin5usP62UmNhF7NNnNzMbRzWVBeLZDd0Qp0gKoSvpjmHLpLbkuWDjzHvI WobNBwI+GPLeWG8JYI7vqTM/NDJTmfuy9JyQ88luE2J4Ccv9UauadCC8phHiyDHm hjxKO0NnGOxRhKhpqTj/ArauoTlHmWQfZrlVvA4+gPtGMtO70RKbEQNJ6uh5+FvH GW7v3Kose0HXBN6XyVCxu5VG7lzPUAO7HLMKf3NNYnTaUZpBSMw7gkgl0ZH5lHQi Q0gGom44KdnBSxeT0YmDYjhWKHAFSXWXy7YPCq61ERULOyVki5bbgoxJ/s3cdosv NvSciC2CP8Ei+HaBPxvPCAZoON31O2CCTerlBL2DIs8x3VOatz9h4cKaU0BzC7Al wCJ21t/6RpP21yZy7CLEKBqvRHCCodrZ+nMRAPhEcp2RZD9CYCvQ0YnYPb5KEf6X bJPsmzNw089JlWxrIEB5DNRfMDc1EAhQURFfkzkT3EMkwtoAP6w24mGBCiB8xPmg Y+7/O3WyXEE= =OOFX -----END PGP SIGNATURE----- --=-=-=-- ------------=_1719484502-8231-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Jun 2024 03:58:48 +0000 Received: from localhost ([127.0.0.1]:47335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIh2V-0003f8-9v for submit@debbugs.gnu.org; Sat, 15 Jun 2024 23:58:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:56508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIh2T-0003ew-OI for submit@debbugs.gnu.org; Sat, 15 Jun 2024 23:58:46 -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 1sIh2S-0004sN-8x for guix-patches@gnu.org; Sat, 15 Jun 2024 23:58:44 -0400 Received: from mail-108-mta114.mxroute.com ([136.175.108.114]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sIh2Q-0004ql-Mu for guix-patches@gnu.org; Sat, 15 Jun 2024 23:58:44 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta114.mxroute.com (ZoneMTA) with ESMTPSA id 1901f326ad900017a3.001 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 16 Jun 2024 03:58:36 +0000 X-Zone-Loop: 78efd3c53ad4f806480fb3a1793e28fa3eb639d70e67 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AkMdTTgEwpAb3Kgd6Us9jBm7QxzvrbcitY5lCjkVkqI=; b=GM7Oburvzi2v1K9/f8KOFPj97j 1eD5evZ5m5jy5a4rndpiGdC5wOfdn5PucBIJ20JhHZ58m6+mv0qm2wa4Pc02n8ff1GyeHdCfih9mP zhCMLyQ8Wzk3s/6Pa1ahvXNIP91vadc0CSgsRVs+ivVaijQ6AH3tUGecc0LI9JFVQVDsgZlEtrL4y YSWWOB6Wb35wWtTZc4pVtKSE2ppOpCNPMzzAiZlGt5TfP8ZV1//oXSdELNE5D2l/o901Bj32/JE3w XxFnjySotXxwjWOYmhajq9wRfhNW+KnN+9PNKfwWLzjDKpa8v5T2VHwetSipG08rFZYBQCNxw91Vh qs8Tjb1A==; From: Richard Sent To: guix-patches@gnu.org Subject: [PATCH] services: web: Improve nginx formatting for extra-content Date: Sat, 15 Jun 2024 23:57:12 -0400 Message-ID: <9556afd9d860c28ea5abe15fd42d8e2989e5244c.1718510232.git.richard@freakingpenguin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com Received-SPF: pass client-ip=136.175.108.114; envelope-from=richard@freakingpenguin.com; helo=mail-108-mta114.mxroute.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Richard Sent 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.4 (--) * gnu/services/web (default-nginx-config): When extra-content is a list, add 4 space indentation and a newline to every line. If it's a string, continue inserting it directly. This makes the list serialization behavior more consistent with other services. Change-Id: Iec8614ba3cfc37292a566197e8d39b352b04846a --- gnu/services/web.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..094b1e4b45 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -771,7 +771,12 @@ (define (default-nginx-config config) "\n" (map emit-nginx-upstream-config upstream-blocks) (map emit-nginx-server-config server-blocks) - extra-content + (match extra-content + ((? string? extra-content) extra-content) + ((? list? extra-content) + (map (lambda (line) + (simple-format #f " ~A\n" line)) + extra-content))) "\n}\n")))) (define %nginx-accounts base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280 -- 2.45.1 ------------=_1719484502-8231-1--