GNU bug report logs - #71676
[PATCH] services: nginx-upstream-configuration: Allow file-like objects

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#71676: closed ([PATCH] services: nginx-upstream-configuration:
 Allow file-like objects)
Date: Wed, 20 Nov 2024 22:42:01 +0000

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

Your message dated Wed, 20 Nov 2024 23:41:17 +0100
with message-id <87jzcxtto2.fsf <at> gnu.org>
and subject line Re: [bug#71676] [PATCH v3] services: nginx-upstream-configuration: Allow file-like objects
has caused the debbugs.gnu.org bug report #71676,
regarding [PATCH] services: nginx-upstream-configuration: Allow file-like objects
to be marked as done.

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


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

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

From: Tomas Volf <~@wolfsden.cz>
To: guix-patches <at> gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH] services: nginx-upstream-configuration: Allow file-like
 objects
Date: Thu, 20 Jun 2024 15:04:03 +0200

* 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

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Tomas Volf <~@wolfsden.cz>
Cc: 71676-done <at> debbugs.gnu.org, Florian Pelz <pelzflorian <at> pelzflorian.de>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#71676] [PATCH v3] services: nginx-upstream-configuration:
 Allow file-like objects
Date: Wed, 20 Nov 2024 23:41:17 +0100

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!

Previous Next

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