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 8KVEKnRAfWYDbAAAqHPOHw:P1 (envelope-from ) for ; Thu, 27 Jun 2024 10:35:32 +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 8KVEKnRAfWYDbAAAqHPOHw (envelope-from ) for ; Thu, 27 Jun 2024 12:35:32 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719484532; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=gzSgKdWnULYUN7AQSzvgd7vAZl1+wNWfrB6I0bYUfJ0=; b=b/aehM19DOlbKgyhIhqlUOHev9+EkycJ36KJAdbuZFwucIkbRIyfVJ5GI99rMVad9NJBpT niLw5gUVAsol21pQbWyfJCNgas8zr+4+T/taMdACNeDsF11cEg7HziYYkHqn8u9SlcC93I cHySA41NFZCW6wZ+mqCfAwzxcd+40ae6mSynwqpCQJrsZEU8TLGIaS56uIMORJB0e3oqrW ihjU+jO3pFgu5giLZaQbkHqzr/w6Bq1CSgTmWwlUx6Mz6L56hPQtGK4aPlmcKrIc7bb745 FyDcMxqpIWSy37/SIiCAYRSMGMa8onPIW5+SrN0VzEmvqQ9N+7DQ5HzGMVg3NA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719484532; a=rsa-sha256; cv=none; b=Y1b5oT1gHyHZwkpFOf+cfICldYODgW5CQ5ezvGyMegHu8L8JX6gJdYB57kEyGArQvnhHKt SLnD1xLddCwGwbqmRwiqHg8QUKG3K49uscAa96VnrQ3N8U+aJ/D4yZ/QFM83wlFc7iZgvz hZXPNhcNrvmbOVYVaBQOd82n5daxckSOhcyC5zBLZsMv/boQwDBDU9GVWXWYXZ2DM0ZIeO qmB0JlRb+VhxFo7OfT0sfm4jHMB0Ev7Lf9/rgI5QPHvm4OQukgffaO7KLl0gDc1+sBKGzD f14Zk7saSyskBttdN5qKSxUrH1QytBYKdaddIdd4rC+qjM9lcEPriiQs4R56kA== 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 86C396B41E for ; Thu, 27 Jun 2024 12:35:32 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMmT1-000788-AU; Thu, 27 Jun 2024 06:35:03 -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 1sMmSz-00077P-6H for guix-patches@gnu.org; Thu, 27 Jun 2024 06:35:01 -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 1sMmSx-000716-RF for guix-patches@gnu.org; Thu, 27 Jun 2024 06:34:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sMmT0-00028u-KJ for guix-patches@gnu.org; Thu, 27 Jun 2024 06:35:02 -0400 Subject: bug#71586: [PATCH v3] services: web: Improve nginx formatting for extra-content Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 27 Jun 2024 10:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 71586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Richard Sent Cc: 71586-done@debbugs.gnu.org Mail-Followup-To: 71586@debbugs.gnu.org, mail@cbaines.net, richard@freakingpenguin.com Received: via spool by 71586-done@debbugs.gnu.org id=D71586.17194844478139 (code D ref 71586); Thu, 27 Jun 2024 10:35:02 +0000 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 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-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: -8.47 X-Migadu-Queue-Id: 86C396B41E X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -8.47 X-TUID: BAcXjWkRRv7U --=-=-= 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----- --=-=-=--