From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJbpv-0006pD-Th for guix-patches@gnu.org; Fri, 18 May 2018 05:38:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJbpq-0005a6-Lw for guix-patches@gnu.org; Fri, 18 May 2018 05:38:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:59474) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJbpq-0005a0-IC for guix-patches@gnu.org; Fri, 18 May 2018 05:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fJbpp-0002wX-Kj for guix-patches@gnu.org; Fri, 18 May 2018 05:38:02 -0400 Subject: [bug#30702] [PATCH] services: nginx: Support extra content in the http block. Resent-Message-ID: References: <20180304200014.29173-1-mail@cbaines.net> <87h8pel6q6.fsf@gnu.org> From: Christopher Baines In-reply-to: <87h8pel6q6.fsf@gnu.org> Date: Fri, 18 May 2018 10:37:34 +0100 Message-ID: <87muwx484h.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 30702@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello, > > Christopher Baines skribis: > >> This helpful when adding content to the nginx configuration file, which = isn't >> supported by the record type used for the configuration. For example, l= ike >> adding proxy_cache_path configuration. >> >> * gnu/packages/web.scm (): Add new extra-content fi= eld. >> (nginx-configuration-extra-content): New field accessor. >> (default-nginx-config): Add support for the extra-content field. >> * doc/guix.texi (NGINX): Document the new extra-content field. >> --- >> doc/guix.texi | 4 ++++ >> gnu/services/web.scm | 9 +++++++-- >> 2 files changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/doc/guix.texi b/doc/guix.texi >> index 057272df4..151bc7ddd 100644 >> --- a/doc/guix.texi >> +++ b/doc/guix.texi >> @@ -15431,6 +15431,10 @@ use the size of the processors cache line. >> @item @code{server-names-hash-bucket-max-size} (default: @code{#f}) >> Maximum bucket size for the server names hash tables. >> >> +@item @code{extra-content} (default: @code{'()}) >> +Extra content for the @code{http} block. Should be a list of strings or >> +G-expressions. > > I find it surprising that it=E2=80=99s a list rather than a string or > string-valued gexp. Thoughts? I've now got around to trying this out, and sent a patch that uses a string, rather than a list. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEERHy+A2M6g58efdvjEhhPDQ1NBccFAlr+nudfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDQ0 N0NCRTAzNjMzQTgzOUYxRTdEREJFMzEyMTg0RjBEMEQ0RDA1QzcACgkQEhhPDQ1N BcfCPA/+NrXZLPuAT+RM+DAXGgQ6TFCY49EUqd+XYKx0Mmtvsf+wh64CdkAWOdaR BqkeAcWf7zNALdo5eM8WZO5l8GH6DrrUFpYBSkJuMZiXtImNhtLwXXQIjLTpn/72 8WBv5zi/RDSHFwdvtVqgWNdFG2zHFLCRre+81v4Ii3gw8xGh8vLucUSRJ/cn4AMQ iHl6i5KK9zmZG6I8zhpE7HfCviXx0ssNSF/FEiXq9erRzyqtMY+abWfKmn5N2fzn o+LdPMU6En/9WsDqaHUCP1xzkPu5YmIY1eMNcvJ0UtZctzBBEDwDbHIwKZ0lRv+d JlMm6wQUSKagl+E6xm5y5OV3BCCkbQcLmz2NX+KUXUTnIkrmngA7H7ylCtSJCYAj ui7Ss63XKIRsLFLVebP0fWxP3U/hwrwS0MtWYYIlNsRZ60PWxXU9Z4QJiQE80iCQ /iPfi5u/bVPQ1CPUzg6ZhJ5AjWZ5SiytZ1Myx8gcvkYKxFh1KHaBKmo+8YvEwZGH UPtrIjN9VuzrPrIdfbrMTzBcC2amyv4leh/sZYvIIGFT2Yl96FVj7+dM8Vms6InS AsfscAWIlMDoNXFXLVNlFcycwyKYM8VaT/oI8hDH091mZAhew7TrQsmXtGa9IUCr 83AoxT1UUjYbHXvGEJkrpA3X5/+d7vS6eSA4mIZpduvYXNRsLXs= =S5Pc -----END PGP SIGNATURE----- --=-=-=--