From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Baines Subject: Re: [PATCH 1/2] gnu: services: web: Add support for NGinx upstream module Date: Thu, 19 Jan 2017 20:16:31 +0000 Message-ID: References: <20170114221249.17939-1-mail@cbaines.net> <20170118080807.23291-1-mail@cbaines.net> <877f5rxkn6.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TM7iw0BTHThk2xeRC7UnLQmdPh7nGTvEb" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUJ8T-0004cS-JZ for guix-devel@gnu.org; Thu, 19 Jan 2017 15:16:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUJ8Q-0008Pi-Vq for guix-devel@gnu.org; Thu, 19 Jan 2017 15:16:41 -0500 In-Reply-To: <877f5rxkn6.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: =?UTF-8?Q?Ludovic_Court=c3=a8s?= Cc: guix-devel@gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --TM7iw0BTHThk2xeRC7UnLQmdPh7nGTvEb Content-Type: multipart/mixed; boundary="G4X7vnVjK3rBk7fmvtQPhMXR8JEq1cPrt"; protected-headers="v1" From: Christopher Baines To: =?UTF-8?Q?Ludovic_Court=c3=a8s?= Cc: guix-devel@gnu.org Message-ID: Subject: Re: [PATCH 1/2] gnu: services: web: Add support for NGinx upstream module References: <20170114221249.17939-1-mail@cbaines.net> <20170118080807.23291-1-mail@cbaines.net> <877f5rxkn6.fsf@gnu.org> In-Reply-To: <877f5rxkn6.fsf@gnu.org> --G4X7vnVjK3rBk7fmvtQPhMXR8JEq1cPrt Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 19/01/17 13:08, Ludovic Court=C3=A8s wrote: > Christopher Baines skribis: >=20 >> * gnu/services/web.scm (): New record ty= pe. >> (): 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-config= uration >> data type and changes to the nginx function. >=20 > Applied with minor changes: no =E2=80=9Cgnu:=E2=80=9D in the subject li= ne, and=E2=80=A6 >=20 >> +Data type representing the configuration of an nginx upstream block. >=20 > @code{upstream}, to make it clear that this is an nginx config term. >=20 >> +prefix @samp{unix:}. For addresses using an IP address or domain name= , > ^ > Two spaces. >=20 >> " index " (config-index-strings (nginx-server-configuration-i= ndex server)) ";\n" >> " server_tokens " (if (nginx-server-configuration-server-toke= ns? 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")) >=20 > 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. >=20 > 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. --G4X7vnVjK3rBk7fmvtQPhMXR8JEq1cPrt-- --TM7iw0BTHThk2xeRC7UnLQmdPh7nGTvEb Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCAAvFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAliBHp8RHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XctRQ//R4DikhGmelR4zUHOPTHJB1twCK0HjSu7 +LNJrtyh8S1m19YOCdUMC3RHeZd94qhFhOjSG3vUoZYTiYIdHMXz0XZs9FFURO+b 8RiOwqHu1oWCQqUwsN+fM/Ls2OgUZCkTejC2MmbPC2E8ho5IxGK9GSPjo5iiEyt+ ER1CkcpeYbn+e0ESC2TGMdjDxPXiX9vtHyGXxVlJLS3JBI516NPNi9auRSHoqfGU mZgxnYSFve0t/iswL0Bnw4fCt2Al3OrIL3CvLGr8NrPorwcWFDYs1qqdg3rRJjxs MnjGiyegvhv7iwsdZ6R73443zrx/gzJqRBPg2oAncRvoAVHpF28EdoDGjGQd5yKt WZw2kXAiUug/f8N7B6h2nVdX5GyK4hsYPSU6/HrBsboLqyNSlstBCZVs3+HB/Wuh YQU7CEo5gAjmjwZfU8fRTMr+OUxVsS9AbSSxAXVvpP1kZZE9s0JSe88alWGxDRqR C4zPPZ9d5f8TMSYXrVEaMYBvCucqnBZRpEBsc8qGFKlKGPJHuZSV+HAuGfA5V5RH TM6uLAAga90SWfEi3CFGfCGG2hAZDAADemAa7HJZjuT1Js2kUtT8y0GCZsREaPnq MaE6PqFP4I61/0pHLdmuRIotg4DiDUNExggwvOY0YftZ/m/yHo4clHC2H5IObPJV tpgu95nhl9c= =DDGi -----END PGP SIGNATURE----- --TM7iw0BTHThk2xeRC7UnLQmdPh7nGTvEb--