branch master updated: berlin: Have nginx depend on the anonip services.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new a44699b  berlin: Have nginx depend on the anonip services.
a44699b is described below

commit a44699b9c5bab307441d5a74edb18d8f06100907
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Sep 13 15:47:59 2022 +0200

    berlin: Have nginx depend on the anonip services.
    
    * hydra/berlin.scm (%anonip-log-files): New variable.
    (log-file->anonip-service-name): New procedure.
    <services>: Add 'shepherd-requirement' field to 'nginx-configuration'.
    Refer to %ANONIP-LOG-FILES instead of the inlined list.
---
 hydra/berlin.scm | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index f943012..58fe68d 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -228,6 +228,23 @@ at MOUNT-POINT."
             (input (format #false "/var/run/anonip/~a" file))
             (output (format #false "/var/log/anonip/~a" file)))))
 
+(define %anonip-log-files
+  ;; List of files handled by Anonip
+  '("http.access.log"
+    "https.access.log"
+    "disarchive.access.log"
+    "dump-guix-gnu-org.https.access.log"
+    "qualif.access.log"
+    "bootstrappable.access.log"
+    "bootstrappable.https.access.log"
+    "workflows-guix-info.access.log"
+    "workflows-guix-info.https.access.log"
+    "issues-guix-gnu-org.https.access.log"))
+
+(define (log-file->anonip-service-name file)
+  "Return the name of the Anonip service handling FILE, a log file."
+  (symbol-append 'anonip-/var/log/anonip/ (string->symbol file)))
+
 
 (operating-system
   (host-name "berlin.guix.gnu.org")
@@ -411,7 +428,17 @@ at MOUNT-POINT."
 
              (service tor-service-type)
 
-             (service nginx-service-type %nginx-configuration)
+             (service nginx-service-type
+                      (nginx-configuration
+                       (inherit %nginx-configuration)
+
+                       ;; Have the nginx shepherd service depend on the
+                       ;; Anonip services so that the writing end of the
+                       ;; logs, handled by Anonip, is ready when nginx starts
+                       ;; running.
+                       (shepherd-requirement
+                        (map log-file->anonip-service-name
+                             %anonip-log-files))))
 
              (service mumi-service-type
                       (mumi-configuration
@@ -476,17 +503,7 @@ at MOUNT-POINT."
                           (allowed-ips '("10.0.0.12/32")))))))
 
              (append
-              (map anonip-service
-                   '("http.access.log"
-                     "https.access.log"
-                     "disarchive.access.log"
-                     "dump-guix-gnu-org.https.access.log"
-                     "qualif.access.log"
-                     "bootstrappable.access.log"
-                     "bootstrappable.https.access.log"
-                     "workflows-guix-info.access.log"
-                     "workflows-guix-info.https.access.log"
-                     "issues-guix-gnu-org.https.access.log"))
+              (map anonip-service %anonip-log-files)
               (website-services)
               (frontend-services %sysadmins
                                  ;; Make sure we get enough build users.