03/03: nginx/berlin: Specify global directives.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit 3b15f11e2febbecf9fc610aa11bad02036a4795e
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Sun Mar 15 12:05:56 2020 +0100

    nginx/berlin: Specify global directives.
    
    * hydra/nginx/berlin.scm (%extra-content): Remove global directives
    from here.
    (%nginx-configuration): Add field global-directives.
---
 hydra/nginx/berlin.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index 26ab55a..45ccc2a 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -710,12 +710,6 @@ PUBLISH-URL."
 
 (define %extra-content
   (list
-   ;; This is a 72-core machine, but let's not use all of them for nginx.
-   "worker_processes 16;"
-
-   ;; "pcre_jit on;"
-   ;; "events { worker_connections  1024; }"
-
    "default_type  application/octet-stream;"
    "sendfile        on;"
 
@@ -777,5 +771,10 @@ PUBLISH-URL."
 (define %nginx-configuration
   (nginx-configuration
    (server-blocks %berlin-servers)
+   (global-directives
+    ;; This is a 72-core machine, but let's not use all of them for nginx.
+    '((worker_processes . 16)
+      (pcre_jit . on)
+      (events . ((worker_connections . 1024)))))
    (extra-content
     (string-join %extra-content "\n"))))