From: Christopher Baines <mail@cbaines.net>
To: 30702@debbugs.gnu.org
Subject: [bug#30702] [PATCH] services: nginx: Support extra content in the http block.
Date: Sun, 4 Mar 2018 20:00:14 +0000 [thread overview]
Message-ID: <20180304200014.29173-1-mail@cbaines.net> (raw)
This helpful when adding content to the nginx configuration file, which isn't
supported by the record type used for the configuration. For example, like
adding proxy_cache_path configuration.
* gnu/packages/web.scm (<nginx-configuration>): Add new extra-content field.
(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.
+
@end table
@end deffn
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index beda481b0..1f58c9b86 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -73,6 +73,7 @@
nginx-configuration-upstream-blocks
nginx-configuration-server-names-hash-bucket-size
nginx-configuration-server-names-hash-bucket-max-size
+ nginx-configuration-extra-content
nginx-configuration-file
<nginx-server-configuration>
@@ -423,6 +424,8 @@
(default #f))
(server-names-hash-bucket-max-size nginx-configuration-server-names-hash-bucket-max-size
(default #f))
+ (extra-content nginx-configuration-extra-content
+ (default '()))
(file nginx-configuration-file ;#f | string | file-like
(default #f)))
@@ -513,7 +516,8 @@ of index files."
(nginx log-directory run-directory
server-blocks upstream-blocks
server-names-hash-bucket-size
- server-names-hash-bucket-max-size)
+ server-names-hash-bucket-max-size
+ extra-content)
(apply mixed-text-file "nginx.conf"
(flatten
"user nginx nginx;\n"
@@ -542,7 +546,8 @@ of index files."
"\n"
(map emit-nginx-upstream-config upstream-blocks)
(map emit-nginx-server-config server-blocks)
- "}\n"
+ extra-content
+ "\n}\n"
"events {}\n"))))
(define %nginx-accounts
--
2.16.0
next reply other threads:[~2018-03-04 20:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-04 20:00 Christopher Baines [this message]
2018-03-17 21:42 ` [bug#30702] [PATCH] services: nginx: Support extra content in the http block Ludovic Courtès
2018-03-17 23:46 ` Christopher Baines
2018-03-18 17:12 ` Ludovic Courtès
2018-05-18 8:54 ` Christopher Baines
2018-05-19 20:36 ` Ludovic Courtès
2018-06-11 18:09 ` Christopher Baines
2018-06-12 9:09 ` Ludovic Courtès
2018-06-12 20:22 ` bug#30702: " Christopher Baines
2018-05-18 9:37 ` [bug#30702] " 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=20180304200014.29173-1-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=30702@debbugs.gnu.org \
/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).