From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpBpx-00053M-VD for guix-patches@gnu.org; Tue, 05 Sep 2017 07:16:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpBpq-0006hO-Fk for guix-patches@gnu.org; Tue, 05 Sep 2017 07:16:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41719) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dpBpq-0006h9-B7 for guix-patches@gnu.org; Tue, 05 Sep 2017 07:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dpBpp-0001nV-N3 for guix-patches@gnu.org; Tue, 05 Sep 2017 07:16:02 -0400 Subject: [bug#28356] [PATCH 1/1] doc: Replace server-list with server-blocks. References: <871snlieja.fsf@magnolia> In-Reply-To: <871snlieja.fsf@magnolia> Resent-Message-ID: From: Oleg Pykhalov Date: Tue, 05 Sep 2017 14:15:30 +0300 Message-ID: <87y3ptgzvx.fsf@magnolia> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: inline; filename=0001-doc-Replace-server-list-with-server-blocks.patch Content-Description: [PATCH 1/1] doc: Replace server-list with server-blocks. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: bug#28356 <28356@debbugs.gnu.org> >From 2799970350073812c2d458d9750649cdf7f23315 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 5 Sep 2017 14:04:14 +0300 Subject: [PATCH 1/1] doc: Replace server-list with server-blocks. * doc/guix.texi (Web Services): Replace 'server-list' with 'server-blocks'. --- doc/guix.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e7a88e19f..9ac52535b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14038,7 +14038,7 @@ A simple example configuration is given below. @example (service nginx-service-type (nginx-configuration - (server-list + (server-blocks (list (nginx-server-configuration (server-name '("www.example.com")) (root "/srv/http/www.example.com") @@ -14086,7 +14086,7 @@ The directory to which NGinx will write log files. The directory in which NGinx will create a pid file, and write temporary files. -@item @code{server-list} (default: @code{'()}) +@item @code{server-blocks} (default: @code{'()}) A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{}. @@ -14097,7 +14097,7 @@ HTTPS. @example (service nginx-service-type (nginx-configuration - (server-list + (server-blocks (list (nginx-server-configuration (server-name '("www.example.com")) (root "/srv/http/www.example.com") @@ -14122,7 +14122,7 @@ requests with two servers. (service nginx-service-type (nginx-configuration - (server-list + (server-blocks (list (nginx-server-configuration (server-name '("www.example.com")) (root "/srv/http/www.example.com") @@ -14144,7 +14144,7 @@ requests with two servers. @item @code{config-file} (default: @code{#f}) If the @var{config-file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, -@code{run-directory}, @code{server-list} and @code{upstream-list}. For +@code{run-directory}, @code{server-blocks} and @code{upstream-list}. 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. -- 2.14.1