GNU bug report logs - #57852
[PATCH] services: nginx: Don't emit empty fields

Previous Next

Package: guix-patches;

Reported by: Simen Endsjø <simendsjo <at> gmail.com>

Date: Fri, 16 Sep 2022 07:53:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57852 in the body.
You can then email your comments to 57852 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#57852; Package guix-patches. (Fri, 16 Sep 2022 07:53:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Simen Endsjø <simendsjo <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 16 Sep 2022 07:53:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Simen Endsjø <simendsjo <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] services: nginx: Don't emit empty fields
Date: Fri, 16 Sep 2022 09:50:37 +0200
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(-)

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 <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust <at> gmail.com>
 ;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton <brown121407 <at> posteo.ro>
+;;; Copyright © 2022 Simen Endsjø <simendsjo <at> gmail.com>
 ;;;
 ;;; 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")
          "")

base-commit: 02c5ed4f1bbd83bddd81902604af6f8add41ac54
-- 
2.37.3





Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Mon, 26 Sep 2022 21:22:01 GMT) Full text and rfc822 format available.

Notification sent to Simen Endsjø <simendsjo <at> gmail.com>:
bug acknowledged by developer. (Mon, 26 Sep 2022 21:22:01 GMT) Full text and rfc822 format available.

Message #10 received at 57852-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Simen Endsjø <simendsjo <at> gmail.com>
Cc: 57852-done <at> debbugs.gnu.org
Subject: Re: bug#57852: [PATCH] services: nginx: Don't emit empty fields
Date: Mon, 26 Sep 2022 23:21:07 +0200
Hi,

Simen Endsjø <simendsjo <at> gmail.com> skribis:

> 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

Good catch.  Applied, thanks!

Ludo’.




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 25 Oct 2022 11:24:12 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 155 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.