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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#57852: closed ([PATCH] services: nginx: Don't emit empty fields)
Date: Mon, 26 Sep 2022 21:22:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Mon, 26 Sep 2022 23:21:07 +0200
with message-id <87fsgdj0ho.fsf <at> gnu.org>
and subject line Re: bug#57852: [PATCH] services: nginx: Don't emit empty fields
has caused the debbugs.gnu.org bug report #57852,
regarding [PATCH] services: nginx: Don't emit empty fields
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
57852: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57852
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

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

[Message part 3 (message/rfc822, inline)]

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’.

Previous Next

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