03/03: hydra: bayfront: Update config.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository maintenance.

commit aad0050c8917d3d796459948c9228f4c81a85709
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue May 30 18:08:33 2023 +0100

    hydra: bayfront: Update config.
    
    bishan has run out of space but now uses hydra-guix-129 as a source
    for nars it doesn't have. This means that bayfront can now remove nars
    as long as both hatysa and hydra-guix-129 have them.
    
    Since I'd like to get rid of bishan, I was thinking of having bayfront
    use hydra-guix-129 directly, but this isn't currently possible as the
    MDC is blocking requests from bayfront.
    
    * hydra/bayfront.scm (%bordeaux.guix.gnu.org-nginx-servers): Add Via
    header to nar requests.
    <services>: Change the nar-herder to remove nars if they're stored on
    both hatysa and hydra-guix-129.  Tweak the
    guix-build-coordinator-agent configuration to allow parallel uploads.
---
 hydra/bayfront.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 742ddb9..a3cf64d 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -618,11 +618,19 @@ add_header Content-Type text/plain;")))
                    "proxy_set_header Connection \"\";")))
           (nginx-location-configuration
            (uri "/file/")
+           ;; TODO: As bishan now doesn't have all the nars, this
+           ;; won't work as well as before.
            (body '("proxy_pass https://nar-storage;";)))
           (nginx-named-location-configuration
            (name "nar-storage")
            (body '("rewrite /internal/(.*) /$1 break;"
                    "proxy_pass https://nar-storage;";
+                   "
+set  $via  \"1.1 bayfront\";
+if ($http_via) {
+    set $via  \"$http_via, $via\";
+}
+proxy_set_header  Via  $via;"
                    "proxy_cache bordeaux-nar;"
                    "proxy_cache_valid 200 28d;"
                    "proxy_ignore_client_abort on;")))
@@ -1222,7 +1230,7 @@ add_header Content-Type text/plain;")))
               (storage "/var/lib/nars")
               (storage-limit 0)
               (storage-nar-removal-criteria
-               '((and (stored-on "https://bishan.guix.gnu.org";)
+               '((and (stored-on "https://hydra-guix-129.guix.gnu.org";)
                       (stored-on "https://hatysa.cbaines.net";))))
               (ttl "180d")
               (log-level 'INFO)
@@ -1271,6 +1279,7 @@ add_header Content-Type text/plain;")))
                 (password-file
                  "/etc/guix-build-coordinator-agent-password")))
               (max-parallel-builds 6)
+              (max-parallel-uploads 6)
               (max-1min-load-average 18)
               (systems '("x86_64-linux" "i686-linux"))
               (derivation-substitute-urls