From patchwork Fri Sep 16 07:50:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Simen_Endsj=C3=B8?= X-Patchwork-Id: 42656 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1DE0927BBEB; Fri, 16 Sep 2022 08:53:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A4F0327BBEA for ; Fri, 16 Sep 2022 08:53:26 +0100 (BST) Received: from localhost ([::1]:50880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZ6A9-0007jK-Qs for patchwork@mira.cbaines.net; Fri, 16 Sep 2022 03:53:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZ69r-0007jA-Pz for guix-patches@gnu.org; Fri, 16 Sep 2022 03:53:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZ69n-0004ja-2f for guix-patches@gnu.org; Fri, 16 Sep 2022 03:53:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZ69m-00045F-Aj for guix-patches@gnu.org; Fri, 16 Sep 2022 03:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57852] [PATCH] services: nginx: Don't emit empty fields Resent-From: Simen =?utf-8?q?Endsj=C3=B8?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Sep 2022 07:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57852 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57852@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166331475115648 (code B ref -1); Fri, 16 Sep 2022 07:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2022 07:52:31 +0000 Received: from localhost ([127.0.0.1]:41535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZ69G-00044J-PH for submit@debbugs.gnu.org; Fri, 16 Sep 2022 03:52:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:49634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZ695-000441-4s for submit@debbugs.gnu.org; Fri, 16 Sep 2022 03:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZ694-00070W-Q6 for guix-patches@gnu.org; Fri, 16 Sep 2022 03:52:18 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]:46075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZ693-0004eu-4O for guix-patches@gnu.org; Fri, 16 Sep 2022 03:52:18 -0400 Received: by mail-lf1-x134.google.com with SMTP id w8so34242265lft.12 for ; Fri, 16 Sep 2022 00:52:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:subject:to:date:from :message-id:from:to:cc:subject:date; bh=g00RbRwUYWg4KYR4cn9UWOFxjcUmayJoSTsC/wkzPm8=; b=O2gIYsqITljFLkUzd8Ng6F2F2dR/Zzu4++O4pLNDgXEs+LN+mSVcinKssCFpICIwuR yet0HB1NTmgC01rWTZAIUljnrACSR93SmPCIS0gjEteHPTO8XBje2Q8diGkc55Dh6GI2 N7epPumiyO17eiJwLwFa+q5DkT3z+OlxE6N5r89FYIq8lUFi8EdTJ58vGMhE/Td+3RjG DfVbwnSnDDLGnfSwT88tIXWaVJqkFROAE0vlbAN3yZU5y9USC2FgY45rfRupmsPajQ5o gT1izP9CL3c76pUf26sRNW04YYZV0S3xIY5ZZ/i0SAWBeO7/GJW2JdzWtLFFAfzBNEt4 KT5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:subject:to:date:from :message-id:x-gm-message-state:from:to:cc:subject:date; bh=g00RbRwUYWg4KYR4cn9UWOFxjcUmayJoSTsC/wkzPm8=; b=W0visSgxpSSeMwjNrE7WxzdSp6ktXUPHm9tCZuWn0Nplo1GMCm5VlyYidC38KSG10V r9jZrdGoMcfQ1A6VqSYzZayNO3Vj90uq0uE9NYK3r90R2pECj//tScUjcEj2PpsfvrsO vRfDdNszTpTIyr8eV+880WV3PwVbsiS8rTH/limwR58T6F5TKeR+2vagLendHHPVeEqS 9LlGvOpDfbGaDTQjK9FSKadJ8QXp4v5kythNblDji4opqcE6/ItHUW3X56GMo6e57zpI Xkk4dnPsNc+zmWNdfEaTTi1hs+UuUSVk5/E0lfAdOLMwih7sJ7YhcNUxYasoE0Z/xQDk RZVw== X-Gm-Message-State: ACrzQf2s/2yKhMfvG26FzgJhmX27mOiu/ZeOPoE/fkPqXLOwdtUL4iV0 yzJ31ihf7nR4q9mUA1aqAEToSag5rd9UYA== X-Google-Smtp-Source: AMsMyM4mXBVlVIbzKUjcEFtcr1FqXraY2LZah6z9qBwHrRYO1gzjrWITHR+wi+/0CRNq80FSrW+5Jw== X-Received: by 2002:a05:6512:3b06:b0:498:fa72:c24d with SMTP id f6-20020a0565123b0600b00498fa72c24dmr1281179lfv.538.1663314734334; Fri, 16 Sep 2022 00:52:14 -0700 (PDT) Received: from simendsjo-laptop (78-72-230-58-no2730.tbcn.telia.com. [78.72.230.58]) by smtp.gmail.com with ESMTPSA id z9-20020a056512370900b00494a27500c1sm3351699lfr.163.2022.09.16.00.52.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 00:52:13 -0700 (PDT) Message-Id: <874jx73gfk.fsf@gmail.com> From: Simen =?utf-8?q?Endsj=C3=B8?= Date: Fri, 16 Sep 2022 09:50:37 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=simendsjo@gmail.com; helo=mail-lf1-x134.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches An empty root or index field is an error in nginx. * gnu/services/web.scm (emit-nginx-server-config): Don't emit root or index fields when they are empty --- gnu/services/web.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) base-commit: 02c5ed4f1bbd83bddd81902604af6f8add41ac54 diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 5bac496f01..e347f5dbcc 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton +;;; Copyright © 2022 Simen Endsjø ;;; ;;; This file is part of GNU Guix. ;;; @@ -646,8 +647,12 @@ (define-syntax-rule (and/l x tail ...) " server_name " (config-domain-strings server-name) ";\n" (and/l ssl-certificate " ssl_certificate " <> ";\n") (and/l ssl-certificate-key " ssl_certificate_key " <> ";\n") - " root " root ";\n" - " index " (config-index-strings index) ";\n" + (if (not (equal? "" root)) + (list " root " root ";\n") + "") + (if (not (null? index)) + (list " index " (config-index-strings index) ";\n") + "") (if (not (nil? try-files)) (and/l (config-index-strings try-files) " try_files " <> ";\n") "")