02/03: hydra: bishan: Update config.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository maintenance.

commit c11084448a22d70b866faf3907c3b4a1f400e67a
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue May 30 18:06:54 2023 +0100

    hydra: bishan: Update config.
    
    * hydra/bishan.scm (%nginx-server-blocks): Add via header on requests,
    and use hydra-guix-129 when nars aren't found locally.
    <services>: Add IPv4 address, set a storage limit for the nar-herder,
    increase the NGinx worker processes and change the nar-storage upstream.
---
 hydra/bishan.scm | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/hydra/bishan.scm b/hydra/bishan.scm
index 060c03d..9538b44 100644
--- a/hydra/bishan.scm
+++ b/hydra/bishan.scm
@@ -34,7 +34,13 @@
            (name "nar-storage-location")
            (body '("rewrite /internal/(.*) /$1 break;"
                    "proxy_pass https://nar-storage;";
-                   "proxy_set_header Host bordeaux.guix.gnu.org:443;")))
+                   "
+set  $via  \"1.1 bishan\";
+if ($http_via) {
+    set $via  \"$http_via, $via\";
+}
+proxy_set_header  Via  $via;"
+                   "proxy_set_header Host hydra-guix-129.guix.gnu.org:443;")))
           (nginx-location-configuration
            (uri "= /latest-database-dump")
            (body '("proxy_pass http://nar-herder;";)))
@@ -139,12 +145,19 @@
               (static-networking
                (addresses
                 (list
+                 (network-address
+                  (device "enp1s0")
+                  (value "5.9.22.61/32"))
                  (network-address
                   (device "enp1s0")
                   (ipv6? #t)
                   (value "2a01:4f8:161:123::/64"))))
                (routes
                 (list
+                 (network-route
+                  (destination "default")
+                  (device "enp1s0")
+                  (gateway "5.9.22.33"))
                  (network-route
                   (destination "default")
                   (device "enp1s0")
@@ -169,18 +182,22 @@
              (nar-herder-configuration
               (mirror "https://bordeaux.guix.gnu.org";)
               (storage "/var/lib/nars")
+              (storage-limit 11615000000000) ; 10.8TiB
               (ttl "180d")
               (log-level 'INFO)))
 
     (service nginx-service-type
              (nginx-configuration
+              (global-directives
+               '((events . ((use . epoll)))
+                 (worker_processes . 8)))
               (upstream-blocks
                (list (nginx-upstream-configuration
                       (name "nar-herder")
                       (servers '("127.0.0.1:8734")))
                      (nginx-upstream-configuration
                       (name "nar-storage")
-                      (servers '("bordeaux.guix.gnu.org:443")))))
+                      (servers '("hydra-guix-129.guix.gnu.org:443")))))
               (server-blocks
                %nginx-server-blocks)))