01/03: Revert "nginx: berlin: Really pass a "worker_processes" directive."

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit 8dc4a08fc1109e05c3b4dc0d6a825fe407f5f69b
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Sun Mar 15 11:42:52 2020 +0100

    Revert "nginx: berlin: Really pass a "worker_processes" directive."
    
    This reverts commit bd9c3308f5b4c7b0d604a1a041072039add36093.
---
 hydra/nginx/berlin.scm | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index f1bbe2f..26ab55a 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -710,11 +710,8 @@ PUBLISH-URL."
 
 (define %extra-content
   (list
-   ;; FIXME: <nginx-configuration> doesn't currently provide a way to pass
-   ;; top-level directives like those below.
-
    ;; This is a 72-core machine, but let's not use all of them for nginx.
-   ;; "worker_processes 16;"
+   "worker_processes 16;"
 
    ;; "pcre_jit on;"
    ;; "events { worker_connections  1024; }"
@@ -777,30 +774,8 @@ PUBLISH-URL."
    ;; Cache timeouts for a little while to avoid increasing pressure.
    "proxy_cache_valid 504 30s;"))
 
-(define %nginx-configuration/intermediate
+(define %nginx-configuration
   (nginx-configuration
    (server-blocks %berlin-servers)
    (extra-content
     (string-join %extra-content "\n"))))
-
-(define %nginx-config-file
-  ;; XXX: This hack allows us to add a "worker_processes" directive at the
-  ;; top level.
-  (let ((generated ((@@ (gnu services web) default-nginx-config)
-                    %nginx-configuration/intermediate)))
-    (computed-file "nginx.conf"
-                   (with-imported-modules '((guix build utils))
-                     #~(begin
-                         (use-modules (guix build utils))
-
-                         (call-with-output-file #$output
-                           (lambda (port)
-                             (display "worker_processes 16;\n"
-                                      port)
-                             (call-with-input-file #$generated
-                               (lambda (input)
-                                 (dump-port input port))))))))))
-
-(define %nginx-configuration
-  (nginx-configuration
-   (file %nginx-config-file)))