From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpprD-0005LE-Mh for guix-patches@gnu.org; Thu, 07 Sep 2017 02:00:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dppr8-0003Ny-PG for guix-patches@gnu.org; Thu, 07 Sep 2017 02:00:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dppr8-0003Nn-Mh for guix-patches@gnu.org; Thu, 07 Sep 2017 02:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dppr8-0008N9-7O for guix-patches@gnu.org; Thu, 07 Sep 2017 02:00:02 -0400 Subject: [bug#28356] [PATCH 1/1] doc: Replace server-list with server-blocks. Resent-Message-ID: Date: Thu, 7 Sep 2017 06:58:52 +0100 From: Christopher Baines Message-ID: <20170907065852.51fe3c8b@cbaines.net> In-Reply-To: <87y3ptgzvx.fsf@magnolia> References: <871snlieja.fsf@magnolia> <87y3ptgzvx.fsf@magnolia> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/SbSsLg4966JOzB3igaog1sB"; protocol="application/pgp-signature" 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: Oleg Pykhalov Cc: bug#28356 <28356@debbugs.gnu.org> --Sig_/SbSsLg4966JOzB3igaog1sB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 05 Sep 2017 14:15:30 +0300 Oleg Pykhalov wrote: > 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. >=20 > * doc/guix.texi (Web Services): Replace 'server-list' with > 'server-blocks'. --- > doc/guix.texi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/doc/guix.texi b/doc/guix.texi > index e7a88e19f..9ac52535b 100644 I'm having problems applying this: error: sha1 information is lacking or useless (doc/guix.texi). error: could not build fake ancestor I think this might be happening, as I don't have something locally that coresponds to e7a88e19f. Is this patch on some version of guix.texi that hasn't made it in to the master branch yet? > --- 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. > =20 > -@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. Thanks for spotting this. Obviously I missed it when removing the nginx-service procedure. It looks like this is also a problem elsewhere in the docs, as I can see a few more instances of server-list. Also, it looks like upstream-list has exactly the same problem. I think it would be good to fix all of the server-list bits in this patch at least. Could you add them? --Sig_/SbSsLg4966JOzB3igaog1sB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlmw4BxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xe8+RAAlaoELm+RdTPGhOLYFRVM2g33+xueUDvmg6vSXt1pByVHSFL9Ct8XzZTH 3X5tLuEEkagwFygsLBHkI16odDm3ih1RJorOAb4Ph4T8nFZKV+a9/iTeGQLTqCH6 Gg69zlPpoyOLp78H5NysEu4Dyazk9yQ63QFyTGwUbB618CHTmj4yHwhSTltTnPAi YLvWcRK9lmr1Aysr14LmhWN8kOlkNbRTFQne3pRdGmtryX9pdaqCEnre+9qfPuun WhttWyvfS+GGM0SMMPkKr02k7F+tyD3F0ZdVjknM6liqr2Mz3jUFDNZMPGWpyAg6 YbWLXQMEeWY1tLasldx8TDqkyr5kPRczF4cXb6ya9kJyOz3X6FbA5iDPSR4RuYZ9 aamSPlWdKCZKiE29+M2qPHkhUDgl6iG2ZAX4JWq7A8gK51a+jlMqfh2gJ/RqVhre milQQZ2DFSsCHL0BSSbb5gDz/f6DT/DNj1HDUJCqVd/V1wbQMwOzZ7iM1X/TE1r3 C9BkHJe4iH8HK9n4R9lol5NVbBtX8FhymdHT1dwe8/h1G9rb5MpLSX6oRyTWDHtz Oe7+6wqws7mVdQHMNRva+ehFMNfKhA+NhkO2gHE0SAEqHeCb28kh9/1MIw3jqmP+ DdFCPpYtHyI+T8piBdUi0XO/JK2Fczbk1/HmYzNNC/WDV2EW1N0= =ApeK -----END PGP SIGNATURE----- --Sig_/SbSsLg4966JOzB3igaog1sB--