nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

doc: Replace upstream-list with upstream-blocks. 

This fixes the documentation to match the implementation.

* doc/guix.texi (Web Services): Replace 'upstream-list' with
  'upstream-blocks'.
This commit is contained in:
Christopher Baines 2017-09-10 11:48:34 +01:00
parent fb1cba687e
commit c2a59a92bb
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guix.texi
View File

@ -14105,12 +14105,12 @@ HTTPS.
(ssl-certificate-key #f)))))) (ssl-certificate-key #f))))))
@end example @end example
@item @code{upstream-list} (default: @code{'()}) @item @code{upstream-blocks} (default: @code{'()})
A list of @dfn{upstream blocks} to create in the generated configuration A list of @dfn{upstream blocks} to create in the generated configuration
file, the elements should be of type file, the elements should be of type
@code{<nginx-upstream-configuration>}. @code{<nginx-upstream-configuration>}.
Configuring upstreams through the @code{upstream-list} can be useful Configuring upstreams through the @code{upstream-blocks} can be useful
when combined with @code{locations} in the when combined with @code{locations} in the
@code{<nginx-server-configuration>} records. The following example @code{<nginx-server-configuration>} records. The following example
creates a server configuration with one location configuration, that creates a server configuration with one location configuration, that
@ -14133,7 +14133,7 @@ requests with two servers.
(nginx-location-configuration (nginx-location-configuration
(uri "/path1") (uri "/path1")
(body '("proxy_pass http://server-proxy;")))))))) (body '("proxy_pass http://server-proxy;"))))))))
(upstream-list (upstream-blocks
(list (nginx-upstream-configuration (list (nginx-upstream-configuration
(name "server-proxy") (name "server-proxy")
(servers (list "server1.example.com" (servers (list "server1.example.com"
@ -14143,7 +14143,7 @@ requests with two servers.
@item @code{file} (default: @code{#f}) @item @code{file} (default: @code{#f})
If a configuration @var{file} is provided, this will be used, rather than If a configuration @var{file} is provided, this will be used, rather than
generating a configuration file from the provided @code{log-directory}, generating a configuration file from the provided @code{log-directory},
@code{run-directory}, @code{server-blocks} and @code{upstream-list}. For @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}. For
proper operation, these arguments should match what is in @var{file} to ensure proper operation, these arguments should match what is in @var{file} to ensure
that the directories are created when the service is activated. that the directories are created when the service is activated.