mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: nginx-upstream-configuration: Allow file-like objects

Browse source 
* 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
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Tomas Volf 2024-10-06 17:22:57 +02:00 committed by Ludovic Courtès
parent 123dcaefe9
commit ad09bf9638
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/guix.texi
View file

@ -32342,7 +32342,16 @@ the default port is 80, and a different port can be specified
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

6
gnu/services/web.scm
View file

@ -704,8 +704,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"))