From unknown Sun Jun 15 08:28:07 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#28356 <28356@debbugs.gnu.org> To: bug#28356 <28356@debbugs.gnu.org> Subject: Status: [PATCH 0/1] doc: Replace server-list with server-blocks. Reply-To: bug#28356 <28356@debbugs.gnu.org> Date: Sun, 15 Jun 2025 15:28:07 +0000 retitle 28356 [PATCH 0/1] doc: Replace server-list with server-blocks. reassign 28356 guix-patches submitter 28356 Oleg Pykhalov severity 28356 normal tag 28356 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 05 07:14:11 2017 Received: (at submit) by debbugs.gnu.org; 5 Sep 2017 11:14:11 +0000 Received: from localhost ([127.0.0.1]:50392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpBo3-0001k3-I9 for submit@debbugs.gnu.org; Tue, 05 Sep 2017 07:14:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpBo1-0001jr-GI for submit@debbugs.gnu.org; Tue, 05 Sep 2017 07:14:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpBnr-0004FY-Qs for submit@debbugs.gnu.org; Tue, 05 Sep 2017 07:14:04 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:40434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpBnr-0004FN-N3 for submit@debbugs.gnu.org; Tue, 05 Sep 2017 07:13:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpBnm-0004eC-Vr for guix-patches@gnu.org; Tue, 05 Sep 2017 07:13:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpBni-00043L-Dp for guix-patches@gnu.org; Tue, 05 Sep 2017 07:13:54 -0400 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]:38682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dpBni-00041M-5z for guix-patches@gnu.org; Tue, 05 Sep 2017 07:13:50 -0400 Received: by mail-lf0-x229.google.com with SMTP id q132so9669389lfe.5 for ; Tue, 05 Sep 2017 04:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=uwZDzzTJlVFWVpT6lYbuv7AQONqIvxqQ28bfJ66LsrY=; b=ItD6RtNLb4038x7g3oonyAoQV4wDGl1Hw8ZXEfPrTu1JPAH4iYePi0U3z42YzhXm3E QiVyZx4GqxAtOBHEMPuRkVsAllF+Ycf2su/LE0lrhzzPRvgmylPduftZU4VGWk53slEt sIrGNZH+5b7uwK9mQvEOjH35Pk+p50Nl5gSOLuZLu1IEQCkn8s5MB0JtWV3aN5OVg0wF VEPueXDt3I1sfCoOAC0ePf+T0fhE5I/sSXM9NRRXNlN+oT2CXPbh3thin8r+q7Oz+vDK Cra+WTvY11lAgszevKwGWN1VQAoTDJhDIwKSXd9L2TMrAfUhRfmBeuDAH/esgUsJQrFX ayVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=uwZDzzTJlVFWVpT6lYbuv7AQONqIvxqQ28bfJ66LsrY=; b=Gzo6Ctjzl3eTjTG1dFFHMmKnWAzVdR8vgO/ZI5BiH8xIu44U9O5+9zwL5h6eGsR6as 4AALklDgZgUc/zn1FXm6HcgAjFrhFRRS3NbfIo1IqVy92afWleCd3jx6TzRd1pGw/bqB FGnfMfZG6ttB7XYruHLBXxERF979WKOWRdMd5pTt3GBbfvA8Nujkv4Fl5Y56pwNkv6io sgS6fAsiORKYEek0JHpelen/QdpWIrDPs/rHs2fJTk3Q+XrRNrEyj1Ep1metqEXv1nkd ItfYFFVHqdBj5/sdOZxMg0DuKsGS3CbGWuOxiumOneeuDtcI0NLMw9Noj63tTPcAHwp0 mYkQ== X-Gm-Message-State: AHPjjUgwIuEmDbwtFXJLaXvlcCPfsmLOyChlArkAD0ruHsSF5xsR0Nar q3UXDDwoN69Ny37X X-Google-Smtp-Source: ADKCNb7C3uNgOGb4Py5Th25ebjqcVqx/lpyFFy/iGRx54QMEpMz2duEpE2H13AQSLbnVlEP+Jdazng== X-Received: by 10.25.16.208 with SMTP id 77mr1038330lfq.156.1504610027330; Tue, 05 Sep 2017 04:13:47 -0700 (PDT) Received: from magnolia (92-100-241-46.dynamic.avangarddsl.ru. [92.100.241.46]) by smtp.gmail.com with ESMTPSA id k7sm85911ljb.19.2017.09.05.04.13.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Sep 2017 04:13:46 -0700 (PDT) From: Oleg Pykhalov To: guix-patches@gnu.org Subject: [PATCH 0/1] doc: Replace server-list with server-blocks. Date: Tue, 05 Sep 2017 14:13:45 +0300 Message-ID: <871snlieja.fsf@magnolia> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) >From 2799970350073812c2d458d9750649cdf7f23315 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 5 Sep 2017 14:09:56 +0300 Subject: [PATCH 0/1] Replace server-list with server-blocks. Following documentation example I got this error --8<---------------cut here---------------start------------->8--- natsu@magnolia ~/src/guix$ guix system build --fallback /home/natsu/dotfiles/guix/system-magnolia.scm /home/natsu/dotfiles/guix/system-magnolia.scm:241:28: error: extraneous field initializers (server-list) --8<---------------cut here---------------end--------------->8--- Oleg Pykhalov (1): doc: Replace server-list with server-blocks. doc/guix.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.14.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 05 07:15:40 2017 Received: (at 28356) by debbugs.gnu.org; 5 Sep 2017 11:15:40 +0000 Received: from localhost ([127.0.0.1]:50400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpBpT-0001mv-T8 for submit@debbugs.gnu.org; Tue, 05 Sep 2017 07:15:40 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:33234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpBpS-0001mj-F9 for 28356@debbugs.gnu.org; Tue, 05 Sep 2017 07:15:38 -0400 Received: by mail-lf0-f43.google.com with SMTP id s11so9764980lfe.0 for <28356@debbugs.gnu.org>; Tue, 05 Sep 2017 04:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version:content-disposition :content-description; bh=Jy41rugfCyJEIhunoaY/mF2wvS4FfWT2phHIRI4N6nU=; b=BZqbI/vslr8zYJpau0hjlZ526w+Oyp0oErPsHe+PBkKrF2TIn+bkWbwlKD4zf/UTB9 cWy0H79RUrewPh7f1LSwvd/Ozt0+73sgwcb6ByGb8Ers/VKYOi/9VzjuKyQ3gbACN/4t fLJ6V4xTfw9BuZiTx56TrNaVcACFVv5lmi6nl4/5XmpJrNbmOfAkeMoldeVuLmIXVb0o DXk5JzUHYJbQcRBEW22OnErcahTCDMFqcip3pCXMr1mXAzutOfkn3a6n92hWW7VSbxtk tz3XZKnYznHZtX+7CEvkrwXkeI5K8bhnLLMBZ/6f3AF5WuCryc27gpn7092TvfStbTpr 2v/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-disposition:content-description; bh=Jy41rugfCyJEIhunoaY/mF2wvS4FfWT2phHIRI4N6nU=; b=NtpD7bzLsEsht3NDOjOlZBRnD05Mzjx3ban+RJEAo+J/tkX/Kd3i8Sjwj2ej3sLOW7 LgLoh4HVidQH6ryo+3+yCKEyMXUL1U87vera8JYX0/sUKZ66451is7d6ZifW6kaZC4yc HPIUAlBnlHvmqyIJXpfAMazlXc/unWwPHd5yL/zj6hvSOK6ENl4BGJrVNpF/E3nXPB2y jYhPkW1FK01pL6FhULJHzcSX/GAj/dPv86xLF5ZgR1AtrIwOwspTNHhkBvJw/5byB1fm azANNTaCeRQKWEEjWgvKUkjHqxCHKsKZbRc5AtKbIjmVBQa1zxR7Z64Y6w4B7X8hKbXT /tYg== X-Gm-Message-State: AHPjjUja8UXCg5Fo4bwiGHNGcDO2mSDNCmKOsB9gGqKvBjzqfa3mpzcd OtC16FyF4Tb/Wh75 X-Google-Smtp-Source: ADKCNb6tWf2F+E9v4bfMRyWUA4uxUasAOeX38l0R6EXaye9mSbsOx++fuENFCKaWEbAmkfOeL+qvhQ== X-Received: by 10.46.69.70 with SMTP id s67mr1540887lja.55.1504610132192; Tue, 05 Sep 2017 04:15:32 -0700 (PDT) Received: from magnolia (92-100-241-46.dynamic.avangarddsl.ru. [92.100.241.46]) by smtp.gmail.com with ESMTPSA id k23sm83434lje.26.2017.09.05.04.15.31 for <28356@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Sep 2017 04:15:31 -0700 (PDT) From: Oleg Pykhalov To: bug#28356 <28356@debbugs.gnu.org> Subject: [PATCH 1/1] doc: Replace server-list with server-blocks. 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. X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 28356 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) >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 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 07 01:59:01 2017 Received: (at 28356) by debbugs.gnu.org; 7 Sep 2017 05:59:02 +0000 Received: from localhost ([127.0.0.1]:53743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dppq9-0008LC-Da for submit@debbugs.gnu.org; Thu, 07 Sep 2017 01:59:01 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:48210 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dppq7-0008Ky-OT for 28356@debbugs.gnu.org; Thu, 07 Sep 2017 01:59:00 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 1A32613E441; Thu, 7 Sep 2017 06:58:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 1D32513E43F; Thu, 7 Sep 2017 06:58:57 +0100 (BST) Date: Thu, 7 Sep 2017 06:58:52 +0100 From: Christopher Baines To: Oleg Pykhalov Subject: Re: [bug#28356] [PATCH 1/1] doc: Replace server-list with server-blocks. Message-ID: <20170907065852.51fe3c8b@cbaines.net> In-Reply-To: <87y3ptgzvx.fsf@magnolia> References: <871snlieja.fsf@magnolia> <87y3ptgzvx.fsf@magnolia> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/SbSsLg4966JOzB3igaog1sB"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28356 Cc: bug#28356 <28356@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --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-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 07 03:46:39 2017 Received: (at 28356) by debbugs.gnu.org; 7 Sep 2017 07:46:39 +0000 Received: from localhost ([127.0.0.1]:53774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dprWJ-0002UA-79 for submit@debbugs.gnu.org; Thu, 07 Sep 2017 03:46:39 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:36066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dprWH-0002Tw-0h for 28356@debbugs.gnu.org; Thu, 07 Sep 2017 03:46:37 -0400 Received: by mail-lf0-f43.google.com with SMTP id m199so22569187lfe.3 for <28356@debbugs.gnu.org>; Thu, 07 Sep 2017 00:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=nRYpZO+74cBW4bEwDNgNvjoLLYqfXJruIneygyHI8e4=; b=nA1KOF2ayoFqzeZSHINjV+JrZYsgN3U9ix1TfdG/MXT1dv45mhGscpZR/8gvFSR9tY 5CfuIly2Zkfy0DWYMb+NK9oUthvdnlx60mSLkHHYsw44CIRen1mK2napiFEKlF3p1E23 YoCKDmeSKkoNqdqWA9U+Sq/Gmutfjmzs7ZEPHHDuhT/IRw4TwULv2fjFa03pIU2v8gcs U0o+tEX7V+o1KVLidRe2uAAzaDl61//WlrZxBVCZE9YckM/iS9mVkuJPxYAIf6uRVK/S iZQ12o8Y8r1Du+zb2JCHXPA65pd0Oq1lI85ThNHag26R8h3iOqGZcjVgXwI0icQu0Qq7 QC0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=nRYpZO+74cBW4bEwDNgNvjoLLYqfXJruIneygyHI8e4=; b=M+HuYwFV5/MRfMMUrIvtjUYDbyIKghpGQ3mDj8UsqrpmfcrbNc8od+Jb+0fqOOoQ9p rMRMsUSxgCqPd/ZyPpOxZK8LNc0EJVljgsqBu2TMUBSwgz53GpbCPlkyzl99XGOgNwsw J7BZeZWYxKctao1Nu3Us4SL9d+rflnUmjLO+LJ/fyb002zQzc46xePrAy5rHdm/jDX/u O+B24yLhBJo3zaZ2WTBiak2m/Av+qsyc8+EXUTQfkHPNw3QBm/PO9zU3qtGWB38uODxw FOJq+EBiMEWhi5+pqjIwPIUz1/Hq9VBTWPWh49ACrBsVm0XHLeMz5I0Luj+fYdGs468r ZZqA== X-Gm-Message-State: AHPjjUjOH3ABUC5J9P/zXdiKRU7cV6GEDJRHgQsVYgVh+U81qptdNSfU eT7L9Jg3aeOH+QwJ X-Google-Smtp-Source: ADKCNb6FZIosnAXUMb0Ik1jKM4e2R1pw6WsDFA5s587xxNX6mAmBYX4cnriOZiS2QbwZIgv4AECfMw== X-Received: by 10.46.86.152 with SMTP id k24mr4714lje.75.1504770390783; Thu, 07 Sep 2017 00:46:30 -0700 (PDT) Received: from magnolia ([178.71.199.83]) by smtp.gmail.com with ESMTPSA id g83sm310733lji.65.2017.09.07.00.46.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Sep 2017 00:46:29 -0700 (PDT) From: Oleg Pykhalov To: Christopher Baines Subject: Re: [bug#28356] [PATCH 1/1] doc: Replace server-list with server-blocks. References: <871snlieja.fsf@magnolia> <87y3ptgzvx.fsf@magnolia> <20170907065852.51fe3c8b@cbaines.net> Date: Thu, 07 Sep 2017 10:46:29 +0300 In-Reply-To: <20170907065852.51fe3c8b@cbaines.net> (Christopher Baines's message of "Thu, 7 Sep 2017 06:58:52 +0100") Message-ID: <87ingvuf1m.fsf@magnolia> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 28356 Cc: bug#28356 <28356@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Christopher, Christopher Baines writes: > 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? Yes, sorry for that. >> =E2=80=A6 > 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? Sure, I replaced all instances in which Emacs (query-replace) found in doc/guix.texi. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-doc-Replace-server-list-with-server-blocks.patch >From 0f4ec7e7cfbf5619ce029e6dc17819d5be104b87 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 5 Sep 2017 14:04:14 +0300 Subject: [PATCH] doc: Replace server-list with server-blocks. * doc/guix.texi (Web Services): Replace 'server-list' with 'server-blocks'. --- doc/guix.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3e9593d0c..b06108524 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14037,7 +14037,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") @@ -14085,7 +14085,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{}. @@ -14096,7 +14096,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") @@ -14121,7 +14121,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") @@ -14143,9 +14143,9 @@ requests with two servers. @item @code{file} (default: @code{#f}) If a configuration @var{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 -proper operation, these arguments should match what is in @var{file} to -ensure that the directories are created when the service is activated. +@code{run-directory}, @code{server-blocks} and @code{upstream-list}. For +proper operation, these arguments should match what is in @var{file} to ensure +that the directories are created when the service is activated. This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the -- 2.14.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 10 07:02:15 2017 Received: (at 28356-done) by debbugs.gnu.org; 10 Sep 2017 11:02:15 +0000 Received: from localhost ([127.0.0.1]:58446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dr00E-00025X-W5 for submit@debbugs.gnu.org; Sun, 10 Sep 2017 07:02:15 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:53152 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dr00C-00025N-Rv for 28356-done@debbugs.gnu.org; Sun, 10 Sep 2017 07:02:13 -0400 Received: by mira.cbaines.net (Postfix, from userid 113) id 9DC0013E4A9; Sun, 10 Sep 2017 12:02:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from localhost (194.85.159.143.dyn.plus.net [143.159.85.194]) by mira.cbaines.net (Postfix) with ESMTPSA id 4A77413E4A7; Sun, 10 Sep 2017 12:02:10 +0100 (BST) Date: Sun, 10 Sep 2017 12:02:09 +0100 From: Christopher Baines To: Oleg Pykhalov Subject: Re: [bug#28356] [PATCH 1/1] doc: Replace server-list with server-blocks. Message-ID: <20170910120209.3f4210b3@cbaines.net> In-Reply-To: <87ingvuf1m.fsf@magnolia> References: <871snlieja.fsf@magnolia> <87y3ptgzvx.fsf@magnolia> <20170907065852.51fe3c8b@cbaines.net> <87ingvuf1m.fsf@magnolia> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/dZiDuUfSGBiIloNXAev/rB5"; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 28356-done Cc: 28356-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --Sig_/dZiDuUfSGBiIloNXAev/rB5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 07 Sep 2017 10:46:29 +0300 Oleg Pykhalov wrote: > Hello Christopher, >=20 > Christopher Baines writes: >=20 > > On Tue, 05 Sep 2017 14:15:30 +0300 > > Oleg Pykhalov wrote: > > =20 > >> 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 =20 > > > > 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? =20 >=20 > Yes, sorry for that. >=20 > >> =E2=80=A6 =20 > > 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? =20 >=20 > Sure, I replaced all instances in which Emacs (query-replace) found in > doc/guix.texi. Awesome, I've now pushed this, along with another patch that fixes the same issue for upstream-list/upstream-blocks. --Sig_/dZiDuUfSGBiIloNXAev/rB5 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlm1G7FfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XezZRAAnbZnDFr+rvYuEy6ohJLDPfBq8WCmtMAztERe3Jgg19w8r1N1bk2hv8XT EvS6XHeQvZ8kcd5xg82Iaal86rVrFt0n1Y7zDbVHUtouA2tOIiiAfHhHGcY9s8F1 RggG/tiOVEnpTlseAj6jrcwiZJacsq0n3ZBgF7XE1xhAW/QkBKEpxrrPlliSVdF5 bSlU4vAeyDgKdFdNy4UgMZTU125dpXzgj9YENAq+4OIayF8ZyyLP7MXlK83gCULD qWXK+lrsrxMZsy/DaIvfQ15f7kiDiJFUCFY7zth0JUHb6SJUZ/fYsF5Rul7EYkir PaOz3rFTNPacsF4bAwY6DEogQlJp3aJ+tiBx0jd2OC/umzMpl6VEuohh5s+CBhHz 65fyL6+p9FG2wpMilvyIV1HMYRQ+ZdWiK3af5uHNQMAOktVylWe6ATKgNzHgksef +NSd4xYDd6QPfq+Lpj1AcuSl2XlZu/MH+s2B0eKQi3uUJMc5pWBE0mMZdZc7Iqp3 1oYqiJyEwzIkrmcFt93BjIcHApI6uLvGvx54/SPg4cvu5TuKLrnf7p72e9D0lqPK n35FFApR8pl/4e37RC/kfE0PiLjETWyKDv4c6qB065x50/vzSDORdmx+buP0fCRA usX9AlLPYiqhz63tVcpZKPaJqxeGNAwPTtIQrkxZrS2ONcBdQqA= =kI/D -----END PGP SIGNATURE----- --Sig_/dZiDuUfSGBiIloNXAev/rB5-- From unknown Sun Jun 15 08:28:07 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 08 Oct 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator