From unknown Sat Jun 21 10:15:05 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#71676 <71676@debbugs.gnu.org> To: bug#71676 <71676@debbugs.gnu.org> Subject: Status: [PATCH] services: nginx-upstream-configuration: Allow file-like objects Reply-To: bug#71676 <71676@debbugs.gnu.org> Date: Sat, 21 Jun 2025 17:15:05 +0000 retitle 71676 [PATCH] services: nginx-upstream-configuration: Allow file-li= ke objects reassign 71676 guix-patches submitter 71676 Tomas Volf <~@wolfsden.cz> severity 71676 normal tag 71676 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 20 09:05:31 2024 Received: (at submit) by debbugs.gnu.org; 20 Jun 2024 13:05:31 +0000 Received: from localhost ([127.0.0.1]:55987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKHTn-0007rM-4A for submit@debbugs.gnu.org; Thu, 20 Jun 2024 09:05:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:40622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sKHTk-0007rC-EN for submit@debbugs.gnu.org; Thu, 20 Jun 2024 09:05:29 -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 1sKHTg-00060X-9y for guix-patches@gnu.org; Thu, 20 Jun 2024 09:05:24 -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 1sKHTe-0006s1-2h for guix-patches@gnu.org; Thu, 20 Jun 2024 09:05:24 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 028B729B966; Thu, 20 Jun 2024 13:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718888719; bh=nJInI/0neE4P6Kx/+BnpD8oWc60oXhY76UFFmBQhJEo=; h=From:To:Cc:Subject:Date; b=mqewlAYvwrDs/IqZh3nr+4BsS6BRPAoRxCs5sOicXAxkgEhRfimIP8FZIcHf4tZO6 WOumyM5Yq4PP/2YuTrQROFi84zbF+jCSDBsVxVU11T8iqdAKEzhy96uCbkTz5Zu5wG hRwhmbUXzbmfB2ncbsFt0MIq415cP4vL9zoM7s210tWcCs0VqPPFtl/cwM9BwdMg/I qRGuZ1VkcYxo5/q02QgZm2jVIndgyjYeJ6SiuL+aXfuN1NRlCXX5CS6N7MyQRtnNXs i2Seg6e3l/39TW8xPrpPIwb7vUx+mnGa35+vCfVhiP6qBGzXqI+dafpB9MyGtCyidi 4qWjkVEPiI/UBDBEpeZgPkkB+9w6mCwA6FYLnz9/JuvAs40UqKY4WS2TnhXWLdFRge NII4E7pZSZnl1SGvTBmDPFNidzbY0lsNrocuwL6c7Y0df+0m4ApWrBAzHfMLDA6vsO FQwt879CdtHkwVUjCCw8ZqgjiUnVqHlJh+dlAWe61D1KgYAivTKbMCgblTqsMUIrYc PaBOzheGe9cMn2n/G+TT+7Fy8EgbxowQzYVpzT+XUa/nCgO2sp/Vi69I54o5oQ53NO iNm1IPNLyMH/xrKa68+ockxDsexkV5XLeJtJPX51sXsS7VLcj7JdMTAOeSJnEgWzdC quE4ZFiG1152k0O02muAkAJI= 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 16F7529B025; Thu, 20 Jun 2024 13:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718888718; bh=nJInI/0neE4P6Kx/+BnpD8oWc60oXhY76UFFmBQhJEo=; h=From:To:Cc:Subject:Date; b=HgztDrb7a5Z3XeoDulodULGSpfKvSUWZa91DpDNOrFy5qP9SeZH0HGqDCNVhfxqMD Hba0fD3/D+VAJ5vqgyAj4Kkf9dq2x6VLSXzdBFwx9crndNgOcq6y+L3BvdrM2Xq0bT Rv8nvYB3QUiXAR3jp1A+h7dKI1IW+vaNBXqAvdHsBBYLYjn0IDcaG3GdpMc1fXZrIA HnC8aFpv0VEWklX9Q0Ns3ZDvSy7EYVt5YfwspRtDD4USvvbmeSbGzWyzujTtRb61no v/R3eMDoc4R+enXzIESDOF3GalkT8MatYZK9TCWfkfwA1RuKep97Ya2nn6NE3m5Aoq /1h2K5SF00NhIp95jvHCd7mkUeBGsVMp4YSGSntCWYbb55wc5O3USxGzlIo0/koCh8 hXDGN8mXZkvN4B5hUcRtG4TSpmqIjlWSpsoolPn4kOXvfhF4yOwd4Z5Vk/O7b/NpB3 rXHEGNNEitfq6kuClBseUq5KXXy8wGotBsU56VKvkvSuFZnMVuAuEITHnyShpmaQ+H Yqnyj9RxumcDSXdvf2VKikQcryGzucJgLPncV1oHz5rMm92bQREf0AVtKC2WSjOs0R DrgvhCnzat8SKJnsT/ZIyCs3OMI0ylu4e+O9Pn5pMgahfcHhQUAQbgqZVTM8L6LQOY AL2uyzv/JGcI02cmO7i7DG6g= From: Tomas Volf <~@wolfsden.cz> To: guix-patches@gnu.org Subject: [PATCH] services: nginx-upstream-configuration: Allow file-like objects Date: Thu, 20 Jun 2024 15:04:03 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Ludovic Courtès , Matthew Trzcinski , Maxim Cournoyer 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 (--) * gnu/services/web.scm (emit-nginx-upstream-config): Support file-like objects. * doc/guix.texi (Web Services)[nginx-upstream-configuration]: Document it. Change-Id: I49996e358174dc77b31e3c91b908a6a72f3eb705 --- This unifies the behavior with extra-content field in nginx-configuration. doc/guix.texi | 11 ++++++++++- gnu/services/web.scm | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 55710dc968..f6f2788ed2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32095,7 +32095,16 @@ Web Services explicitly. @item @code{extra-content} -A string or list of strings to add to the upstream block. +Additional content to be appended to the upstream block. Can be a +string or file-like object or list of thereof. In case of list, each +item is prefixed with indentation and suffixed with a new line. Nested +lists are flattened. + +@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 340988fdd8..7424f7302f 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -701,8 +701,8 @@ (define (emit-nginx-upstream-config upstream) (cons "\n" (map (lambda (line) - (simple-format #f " ~A\n" line)) - (flatten extra-content))) + `(" " ,line "\n")) + extra-content)) '())) " }\n")) -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 20 16:25:03 2024 Received: (at 71676) by debbugs.gnu.org; 20 Jun 2024 20:25:03 +0000 Received: from localhost ([127.0.0.1]:43043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKOL9-0003Ug-HC for submit@debbugs.gnu.org; Thu, 20 Jun 2024 16:25:03 -0400 Received: from wolfsden.cz ([37.205.8.62]:42844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sKOL6-0003UB-Hk for 71676@debbugs.gnu.org; Thu, 20 Jun 2024 16:25:02 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B750129DE60; Thu, 20 Jun 2024 20:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718915094; bh=o7pKrvHsIHyqvga/rkzxIMAY5tryZIcwf3ByeAlYmXQ=; h=From:To:Cc:Subject:Date; b=rK8KscApBZuvsDmGssh91UZ9iMaDmrOcdqu7MWVeorOteq9zZd9sRCenSLD4CzTbb IDeIphn5VQ2yy/t9BqUqMIPc3C5q58zAs0I/yYhR6D1xLpbbxhze3V/VkdUUNbqzkx 1w0LesSM6Ne2RyoxT/ZtrD9osBoVvIz0kjZZeWJHL1oImjRwvkPyznCWavegLNZ26l TQ2v6kTJfhd28z2xe4Wq3vq/nZuLucwNc1FX43HMucIpMHLMns7XqALgTbspHnpR76 6pC3esfJFWhdo1yfP4AeeQfJO37BxkthWp8ox9CTlfBsb9xZOGIb7aHKvukVw+6LDi lzJFlcAHwqKHZKqia+UouqrTA752SS4RXUwct3pSXYjLXbO9OauQBm6rpc80tGuMu5 Zluay7GTeENQP81cWYiKZ8GClXlJBVUcshvfXQxrgjItSVx1jpit55dWzNPBbp5+/2 biMf+vwW+YaHan91vOmdKSpdWLtrTbiFj8o3QSNG5+jtSrR/EfEr+jvT+27hWYd+I+ fcYgrVTmJLJ00I0+rK7SiW/L81IXVplaqr7aOdPpeboUQtZPrVW4a5LsCgcPFjh9FV JIVPfQK/vCADQFtlPuYfsne+j4B8EChI4VNtGhonZejgZy5ZFMJWM8zzB6iEkG/vXu hleojZO4uYWcfKBxVPUzB10U= 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 7CA3929CADB; Thu, 20 Jun 2024 20:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1718915093; bh=o7pKrvHsIHyqvga/rkzxIMAY5tryZIcwf3ByeAlYmXQ=; h=From:To:Cc:Subject:Date; b=YCzoQ/aEOl50jS1R1CZJ75cnKKskV8BH8LZIvGvXpzbosoXw0OHYBlXFGsoPulFKs oOSacPTLnrs7ZDZ8F5a5ZdyWSNmvAVsM063l/rouo7mBt6KrY9V1IMDLLhf0JJT1ku p4dNXa1piHLTGNxrnxLyb5H8SsoEyGGaYR4SacBQa9JLzYcxjFjsYsuxsxDKEb9T0G Y0FphxMIVJDOhCxdrSbX6d3Xr6JyUeopTcwqOy59ERCdvLEC4wVcUZpdJA1j3IB2fp GOqB56PfjKlnLcSRn9LQJdIymg31T1Vr8nkPvjbWxruXqXhdWznsdNj1Yge+8n7hXF +wjDUhSuDXPdd2EX5/gTLIOVDTX8d5NWle3DNI93IA3/xXT8K8l4cyn75KB4+/trV/ HzF5POrwlI9y1Sxj0qBuBmsuJb8GNsYYSUIsT8z8yLgdVOU+IXMU2WjuFFW3y9lo16 wcG2+e+BNsfiHkT0RcRysRGKrG3Nzz3/5GrH+63OiG728Iz4GCl+BRbBzNsSxyIoXj L48R4xxct7hGDtHRyRdYasf3h2WZp01QPPnViVQpiLUDRSIt3Hidk3DqUexKit1vQy 4q7K2weoGif3cOwH/z8yksrjtGdVxiaVagK2zLPwsnr4RpxaSGUzZireRIrTjun6FM fC6p1KT0yrvqXTMX/4DC23BI= From: Tomas Volf <~@wolfsden.cz> To: 71676@debbugs.gnu.org Subject: [PATCH v2] services: nginx-upstream-configuration: Allow file-like objects Date: Thu, 20 Jun 2024 22:23:04 +0200 Message-ID: X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Ludovic Courtès , Matthew Trzcinski , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71676 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 (-) * gnu/services/web.scm (emit-nginx-upstream-config): Support file-like objects. * doc/guix.texi (Web Services)[nginx-upstream-configuration]: Document it. Change-Id: I49996e358174dc77b31e3c91b908a6a72f3eb705 --- v2: Keep support for plain string or file-like object. I did not realize that flatten also accepts non-lists and wraps them in a list. doc/guix.texi | 11 ++++++++++- gnu/services/web.scm | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 55710dc968..f6f2788ed2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32095,7 +32095,16 @@ Web Services explicitly. @item @code{extra-content} -A string or list of strings to add to the upstream block. +Additional content to be appended to the upstream block. Can be a +string or file-like object or list of thereof. In case of list, each +item is prefixed with indentation and suffixed with a new line. Nested +lists are flattened. + +@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 340988fdd8..8d81c926e8 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -701,8 +701,10 @@ (define (emit-nginx-upstream-config upstream) (cons "\n" (map (lambda (line) - (simple-format #f " ~A\n" line)) - (flatten extra-content))) + `(" " ,line "\n")) + (if (list? extra-content) + extra-content + (list extra-content)))) '())) " }\n")) -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 06 11:23:39 2024 Received: (at 71676) by debbugs.gnu.org; 6 Oct 2024 15:23:39 +0000 Received: from localhost ([127.0.0.1]:41959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxT6h-0007ij-2B for submit@debbugs.gnu.org; Sun, 06 Oct 2024 11:23:39 -0400 Received: from wolfsden.cz ([37.205.8.62]:60396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxT6d-0007iZ-O5 for 71676@debbugs.gnu.org; Sun, 06 Oct 2024 11:23:36 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 8F29931E83F; Sun, 6 Oct 2024 15:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728228208; bh=sTV4B01rkQVLbRgeBwaBGyYCMsFYJcWCgvl8IFelblg=; h=From:To:Cc:Subject:Date; b=BGbSmsuAvt0MigDEvBMMd6DFJlbM2AeDno4iZdyOiYT3YhtpUDTaWJziDx0CRLWcC vQf7titfRRq34jW2QUVOOvz7mnb7pRRdPurmkx2iibrEKOZnmnFxrWNWLn18L//3Cr XSUWaqLE2Cd9+jV4Ek2L1KrUooz9ip5bRTAoiJp62lb8mvr7F4J73C/Z9OqH7dz0i0 rn3HaEwzMNIcBMVLGYcai0vbp3q64fCHb/xlmFZbWfW9BRJ6B16CsW0g6XVkBhIX30 Jey9KQb2L4Ai/5lpTixoJXPD+VWVwVdFLKTeRrC08o7Rgm2AqjB8Zh10ly3QXKbmhC ztCOGM6eNCw3kHhXaXJ8SwqCcdGE2mH/N9w6nZuLIj2hap0Ueig1dExbzMueFbasxV OVnZtm5cB0mSWikxgKmMlmMxqvFlC66N+lLotHdlFMWS0l4jUvr9S5/7xoiHwPOz2v b9LlRLbIrhTCfjbQUPn177yeqFNu79c8/ezzIxhbJevMwRd9YNLSoHA4cGFJHHwBQe Jhpg4X/Jc7NVOroGms+9PvEW/6MuRFqi5EtoCLMt8sjZeDgMIfORiK/Hr4D9JWYnVf 8g1HjZ336XU2gn3pxDJkc9PonRaST9JfHG5UHxixQVyUkxjeYrD3DNrPzty5NBdgSe SF8JQ0SLgKGar8j864h4C6Qs= 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 2F60031DFCB; Sun, 6 Oct 2024 15:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728228208; bh=sTV4B01rkQVLbRgeBwaBGyYCMsFYJcWCgvl8IFelblg=; h=From:To:Cc:Subject:Date; b=BGbSmsuAvt0MigDEvBMMd6DFJlbM2AeDno4iZdyOiYT3YhtpUDTaWJziDx0CRLWcC vQf7titfRRq34jW2QUVOOvz7mnb7pRRdPurmkx2iibrEKOZnmnFxrWNWLn18L//3Cr XSUWaqLE2Cd9+jV4Ek2L1KrUooz9ip5bRTAoiJp62lb8mvr7F4J73C/Z9OqH7dz0i0 rn3HaEwzMNIcBMVLGYcai0vbp3q64fCHb/xlmFZbWfW9BRJ6B16CsW0g6XVkBhIX30 Jey9KQb2L4Ai/5lpTixoJXPD+VWVwVdFLKTeRrC08o7Rgm2AqjB8Zh10ly3QXKbmhC ztCOGM6eNCw3kHhXaXJ8SwqCcdGE2mH/N9w6nZuLIj2hap0Ueig1dExbzMueFbasxV OVnZtm5cB0mSWikxgKmMlmMxqvFlC66N+lLotHdlFMWS0l4jUvr9S5/7xoiHwPOz2v b9LlRLbIrhTCfjbQUPn177yeqFNu79c8/ezzIxhbJevMwRd9YNLSoHA4cGFJHHwBQe Jhpg4X/Jc7NVOroGms+9PvEW/6MuRFqi5EtoCLMt8sjZeDgMIfORiK/Hr4D9JWYnVf 8g1HjZ336XU2gn3pxDJkc9PonRaST9JfHG5UHxixQVyUkxjeYrD3DNrPzty5NBdgSe SF8JQ0SLgKGar8j864h4C6Qs= From: Tomas Volf <~@wolfsden.cz> To: 71676@debbugs.gnu.org Subject: [PATCH v3] services: nginx-upstream-configuration: Allow file-like objects Date: Sun, 6 Oct 2024 17:22:57 +0200 Message-ID: <734857b0ef0cc747f01f5cd45f6776fce89a9e64.1728228177.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71676 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 (-) * gnu/services/web.scm (emit-nginx-upstream-config): Support file-like objects. * doc/guix.texi (Web Services)[nginx-upstream-configuration]: Document it. Change-Id: I49996e358174dc77b31e3c91b908a6a72f3eb705 --- v2: Keep support for plain string or file-like object. I did not realize that flatten also accepts non-lists and wraps them in a list. v3: Rebase on latest master. doc/guix.texi | 11 ++++++++++- gnu/services/web.scm | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 52e36e4354..b45b7c2c93 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32229,7 +32229,16 @@ Web Services explicitly. @item @code{extra-content} -A string or list of strings to add to the upstream block. +Additional content to be appended to the upstream block. Can be a +string or file-like object or list of thereof. In case of list, each +item is prefixed with indentation and suffixed with a new line. Nested +lists are flattened. + +@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 cc6f4e6d9b..39c0035405 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -703,8 +703,10 @@ (define (emit-nginx-upstream-config upstream) (cons "\n" (map (lambda (line) - (simple-format #f " ~A\n" line)) - (flatten extra-content))) + `(" " ,line "\n")) + (if (list? extra-content) + extra-content + (list extra-content)))) '())) " }\n")) -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 20 17:41:30 2024 Received: (at 71676-done) by debbugs.gnu.org; 20 Nov 2024 22:41:30 +0000 Received: from localhost ([127.0.0.1]:48172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDtO6-0004Uh-9y for submit@debbugs.gnu.org; Wed, 20 Nov 2024 17:41:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDtO4-0004UV-Lm for 71676-done@debbugs.gnu.org; Wed, 20 Nov 2024 17:41:29 -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 1tDtNy-00011c-FW; Wed, 20 Nov 2024 17:41:22 -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=tZuUX3LbDTqrqpDazbqOSkAPKWg4iht8FTfRSmgd6eg=; b=Usuxb+VKEJJ1Ow0Yhuqn 41Gi7vjM5VfLz2AnJZbwUISi6TssUAccyxh9zjmd+AeXHswXG7kLI8jRJ+VN+aNJDuipQA6uTsdB/ H41cOkqyZaY51KVLM/xxCeTdM+QIZAG1/Pi09r6BwTzXDfsSADCTNnxyiUyCIiTTjBhupIfD9BmSx 9OZLDhQ6jA8lrE2uQz6Q9jxZOussXAblV45+n6cK+uVXXSivcEiJrpF4hVXy/9BzXrPOLGlcLfUT2 Lll5qyut5+cAkkohe6Xaw4VtTYWInEEbvLalSo6AjklAUSCGy21pynxL+qpYlNT+jk/ZkyDLZrFbd oUdVGsJ90BTH+g==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#71676] [PATCH v3] services: nginx-upstream-configuration: Allow file-like objects In-Reply-To: <734857b0ef0cc747f01f5cd45f6776fce89a9e64.1728228177.git.~@wolfsden.cz> (Tomas Volf's message of "Sun, 6 Oct 2024 17:22:57 +0200") References: <734857b0ef0cc747f01f5cd45f6776fce89a9e64.1728228177.git.~@wolfsden.cz> Date: Wed, 20 Nov 2024 23:41:17 +0100 Message-ID: <87jzcxtto2.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: 71676-done Cc: 71676-done@debbugs.gnu.org, Florian Pelz , Maxim Cournoyer 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: > * gnu/services/web.scm (emit-nginx-upstream-config): Support file-like > objects. > * doc/guix.texi (Web Services)[nginx-upstream-configuration]: Document it. > > Change-Id: I49996e358174dc77b31e3c91b908a6a72f3eb705 > --- > v2: Keep support for plain string or file-like object. I did not realize > that flatten also accepts non-lists and wraps them in a list. > v3: Rebase on latest master. Applied, thanks! From unknown Sat Jun 21 10:15:05 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:08 +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