diff options
author | Julien Lepiller <julien@lepiller.eu> | 2016-12-13 20:44:31 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-03 14:30:44 +0100 |
commit | 3b9b12ef49d0b6d7a8887513acb9e9a1a8325148 (patch) | |
tree | 552f9cbe7c35f7a5b4d48897e05169f919e01152 /doc | |
parent | 7b030c9f9baf9048a9bf2daa2278c6ef4ceca6f6 (diff) | |
download | guix-3b9b12ef49d0b6d7a8887513acb9e9a1a8325148.tar guix-3b9b12ef49d0b6d7a8887513acb9e9a1a8325148.tar.gz |
services: nginx: Rename "vhost" to "server".
* gnu/services/web.scm (<nginx-vhost-configuration>): Rename to...
(<nginx-server-configuration>): ... this.
* doc/guix.texi (Web Services): Adjust accordingly.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/guix.texi | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 8c65f44dac..fde9601e82 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11827,7 +11827,7 @@ The @code{(gnu services web)} module provides the following service: @deffn {Scheme Procedure} nginx-service [#:nginx nginx] @ [#:log-directory ``/var/log/nginx''] @ [#:run-directory ``/var/run/nginx''] @ - [#:vhost-list (list (nginx-vhost-configuration))] @ + [#:server-list (list (nginx-server-configuration))] @ [#:config-file] Return a service that runs @var{nginx}, the nginx web server. @@ -11838,32 +11838,32 @@ files are written to @var{run-directory}. For proper operation, these arguments should match what is in @var{config-file} to ensure that the directories are created when the service is activated. -As an alternative to using a @var{config-file}, @var{vhost-list} can be -used to specify the list of @dfn{virtual hosts} required on the host. For +As an alternative to using a @var{config-file}, @var{server-list} can be +used to specify the list of @dfn{server blocks} required on the host. For this to work, use the default value for @var{config-file}. @end deffn -@deftp {Data Type} nginx-vhost-configuration -Data type representing the configuration of an nginx virtual host. +@deftp {Data Type} nginx-server-configuration +Data type representing the configuration of an nginx server block. This type has the following parameters: @table @asis @item @code{http-port} (default: @code{80}) Nginx will listen for HTTP connection on this port. Set it at @code{#f} if nginx should not listen for HTTP (non secure) connection for this -@dfn{virtual host}. +@dfn{server block}. @item @code{https-port} (default: @code{443}) Nginx will listen for HTTPS connection on this port. Set it at @code{#f} if -nginx should not listen for HTTPS (secure) connection for this @dfn{virtual host}. +nginx should not listen for HTTPS (secure) connection for this @dfn{server block}. Note that nginx can listen for HTTP and HTTPS connections in the same -@dfn{virtual host}. +@dfn{server block}. @item @code{server-name} (default: @code{(list 'default)}) -A list of server names this vhost represents. @code{'default} represents the -default vhost for connections matching no other vhost. +A list of server names this server represents. @code{'default} represents the +default server for connections matching no other server. @item @code{root} (default: @code{"/srv/http"}) Root of the website nginx will serve. |