From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cIJUMR1jbmbX0gAA62LTzQ:P1 (envelope-from ) for ; Sun, 16 Jun 2024 03:59:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cIJUMR1jbmbX0gAA62LTzQ (envelope-from ) for ; Sun, 16 Jun 2024 05:59:25 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none ("invalid DKIM record") header.d=freakingpenguin.com header.s=x header.b=GM7Oburv; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718510365; a=rsa-sha256; cv=none; b=YrW007u10L/TsjkViJwTO5G/d3AYy/fdo2IgK954f0h7bgy2csy36FFRtzioDk7LWb67ia UxghqxCcNEkiOaIleZNDkJjCa2G6lnM7aM2GjMX0B2tLfQCg59pZCiyACQgQve14zFW3VG adhxV1ZhZhanmO6zqXT4oWC5xkJkBQBAQVW49rnTC+IveTvdUNkImHmwA40OUPGIKaXFOS kLHQUDRs6WJoprNGAUgCKuaItkdP4E/gV+E+965xqCfSAI043bO75THXoi3bpzXuduZ6ws P7Li2N+A6IC3A7Y23pWYVRm8WQEkd+OQKIMI3s6SX1uOvNf18i2wwvHIo8a4Ag== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none ("invalid DKIM record") header.d=freakingpenguin.com header.s=x header.b=GM7Oburv; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718510365; 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=AkMdTTgEwpAb3Kgd6Us9jBm7QxzvrbcitY5lCjkVkqI=; b=r0vfdkqyNjREyqm1OeREK6q4pImias86MZ3bvWPNe4N0nbyPkRF8JtntZsb6SWD4rMRKKW JxVGSk8MIcZZGi8+aL5DQ8GdFGPmiuFp4OESsU3PW/V/H+rsXuZEvIF18yvryqQBIs5Crk 9nw/hom87tmjdlOO5nvg9XH7Gjk2yxltQC2JGlkJb+qyCRSzsrcLvr8Yv7pfosfdKTVTtA 1yot2dDKJ/zA/XvUMQKYqRGUaYoWEp5T53wqT879qfGR40/xGpRfxfJMwSuYH2XIsTSLWs pvyujOUgTq13/czvkCq6+J7QYeYTQxdno4psgnsVwGEQ2cRE3J55DvS+gzO4Bw== 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 527606B396 for ; Sun, 16 Jun 2024 05:59:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sIh2m-0004up-BT; Sat, 15 Jun 2024 23:59:04 -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 1sIh2k-0004uX-H8 for guix-patches@gnu.org; Sat, 15 Jun 2024 23:59:02 -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 1sIh2k-0004rY-9F for guix-patches@gnu.org; Sat, 15 Jun 2024 23:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sIh2k-0003fy-C0 for guix-patches@gnu.org; Sat, 15 Jun 2024 23:59:02 -0400 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-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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.05 X-Migadu-Scanner: mx12.migadu.com X-Spam-Score: -5.05 X-Migadu-Queue-Id: 527606B396 X-TUID: J7qhOJUwx315 * 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