unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: ludo@gnu.org (Ludovic Courtès)
To: Christopher Baines <mail@cbaines.net>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 1/2] gnu: services: web: Add support for NGinx upstream module
Date: Thu, 19 Jan 2017 14:08:13 +0100	[thread overview]
Message-ID: <877f5rxkn6.fsf@gnu.org> (raw)
In-Reply-To: <20170118080807.23291-1-mail@cbaines.net> (Christopher Baines's message of "Wed, 18 Jan 2017 08:08:06 +0000")

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-configuration
> data type and changes to the nginx function.

Applied with minor changes: no “gnu:” in the subject line, and…

> +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-index 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’.

  parent reply	other threads:[~2017-01-19 13:08 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-14 22:12 [PATCH 1/2] gnu: services: web: Add support for NGinx upstream module Christopher Baines
2017-01-14 22:12 ` [PATCH 2/2] gnu: services: web: Add support for NGinx location blocks Christopher Baines
2017-01-18  8:08 ` [PATCH 1/2] gnu: services: web: Add support for NGinx upstream module Christopher Baines
2017-01-18  8:08   ` [PATCH 2/2] gnu: services: web: Add support for NGinx location blocks Christopher Baines
2017-01-19 13:19     ` Ludovic Courtès
2017-01-19 13:48     ` New nginx test! Ludovic Courtès
2017-01-19 13:08   ` Ludovic Courtès [this message]
2017-01-19 20:16     ` [PATCH 1/2] gnu: services: web: Add support for NGinx upstream module Christopher Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877f5rxkn6.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=guix-devel@gnu.org \
    --cc=mail@cbaines.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).