From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH 1/2] gnu: services: web: Add support for NGinx upstream
	module
Date: Thu, 19 Jan 2017 14:08:13 +0100
Message-ID: <877f5rxkn6.fsf@gnu.org>
References: <20170114221249.17939-1-mail@cbaines.net>
	<20170118080807.23291-1-mail@cbaines.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57196)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1cUCRv-0007l4-N2
	for guix-devel@gnu.org; Thu, 19 Jan 2017 08:08:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1cUCRs-0006MZ-Hm
	for guix-devel@gnu.org; Thu, 19 Jan 2017 08:08:19 -0500
In-Reply-To: <20170118080807.23291-1-mail@cbaines.net> (Christopher Baines's
	message of "Wed, 18 Jan 2017 08:08:06 +0000")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Christopher Baines <mail@cbaines.net>
Cc: guix-devel@gnu.org

Christopher Baines <mail@cbaines.net> skribis:

> * gnu/services/web.scm (<nginx-upstream-configuration>): New record type.
> (<nginx-configuration>): Add new field upstream-blocks.
> (nginx-upstream): New function.
> (default-nginx-config): Add upstream-list parameter.
> (nginx-service): Add optional upstream list keyword argument.
> * doc/guix.text (Web Services): Document the new nginx-upstream-configura=
tion
> data type and changes to the nginx function.

Applied with minor changes: no =E2=80=9Cgnu:=E2=80=9D in the subject line, =
and=E2=80=A6

> +Data type representing the configuration of an nginx upstream block.

@code{upstream}, to make it clear that this is an nginx config term.

> +prefix @samp{unix:}. For addresses using an IP address or domain name,
                       ^
Two spaces.

>     "      index " (config-index-strings (nginx-server-configuration-inde=
x server)) ";\n"
>     "      server_tokens " (if (nginx-server-configuration-server-tokens?=
 server)
>                                "on" "off") ";\n"
> +(define (nginx-upstream-config upstream)
> +  (string-append
> +   "    upstream " (nginx-upstream-configuration-name upstream) " {\n"
> +   (apply
> +    string-append
> +    (map (lambda (server)
> +           (simple-format #f "      server ~A;\n" server))
> +         (nginx-upstream-configuration-servers upstream)))
>     "    }\n"))

Here there was a syntax error: the last line must also be kept in the
procedure just above the hunk.  I guess that was introduced while
rebasing patches or something.

Thanks!

Ludo=E2=80=99.