diff options
| author | Tomas Volf <~@wolfsden.cz> | 2024-10-06 17:40:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-11-20 23:39:11 +0100 |
| commit | 123dcaefe921d390a5670b39ef92ff614b99ac11 (patch) | |
| tree | f224c2f1a3a8e23b241ab54ae99362d6859e8436 /gnu | |
| parent | b5e7f2a65a184093319f30b8f48cae455141a3f7 (diff) | |
| download | guix-123dcaefe921d390a5670b39ef92ff614b99ac11.tar.gz guix-123dcaefe921d390a5670b39ef92ff614b99ac11.zip | |
services: nginx: Print extra-content before the server-blocks.
The configuration file is processed sequentially, which meant that there was
no way to set for example log format shared between the server-blocks, because
the final configuration file would have this order:
...
http {
...
server {
}
...
$extra-content
}
Moving the extra-content before the serialization of server-blocks resolves
this.
* gnu/services/web.scm (default-nginx-config): Move extra-content before
server-blocks.
Change-Id: Ie8286a533dfed575abc58a0f4800706b3ad6adc2
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/web.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 4cf7c68997..6f77efaaf2 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -771,10 +771,7 @@ of index files." (number->string server-names-hash-bucket-max-size) ";\n") "") - "\n" - (map emit-nginx-upstream-config upstream-blocks) - (map emit-nginx-server-config server-blocks) - (match extra-content + (match extra-content ((? list? extra-content) (map (lambda (line) `(" " ,line "\n")) @@ -782,7 +779,10 @@ of index files." ;; XXX: For compatibility strings and gexp's are inserted ;; directly. (_ extra-content)) - "\n}\n")))) + "\n" + (map emit-nginx-upstream-config upstream-blocks) + (map emit-nginx-server-config server-blocks) + "}\n")))) (define %nginx-accounts (list (user-group (name "nginx") (system? #t)) |