On 19/01/17 13:08, Ludovic Courtès wrote:
> 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!

Great, thanks for applying this. As you say, I think the error in the
first patch was a result in splitting the changes in to two patches.