branch master updated: hydra: bayfront: Add initial configuration for qa.guix.gnu.org.

[Christopher Baines]

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

cbaines pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new c1e23f3  hydra: bayfront: Add initial configuration for 
qa.guix.gnu.org.
c1e23f3 is described below

commit c1e23f32b98db03867fb025f33be452315a68f0c
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue Sep 6 10:39:25 2022 +0100

    hydra: bayfront: Add initial configuration for qa.guix.gnu.org.
    
    This is currently serving https://git.cbaines.net/guix/qa-frontpage/
    
    * hydra/bayfront.scm (%certbot-configuration): Add qa.guix.gnu.org
    certificate.
    (%qa.guix.gnu.org-nginx-servers): New variable.
    [services]: Add qa-frontpage nginx upstream block and include qa
    servers.
---
 hydra/bayfront.scm | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 1a372b8..e2aece4 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -87,6 +87,9 @@
                       "guix-hpc.bordeaux.inria.fr"
                       "coordinator.bayfront.guix.gnu.org"))
            (deploy-hook %nginx-deploy-hook))
+          (certificate-configuration
+           (domains '("qa.guix.gnu.org"))
+           (deploy-hook %nginx-deploy-hook))
           (certificate-configuration
            (domains '("bordeaux.guix.gnu.org"))
            (deploy-hook %nginx-deploy-hook))))))
@@ -687,6 +690,41 @@ add_header Content-Type text/plain;")))
         "access_log /var/log/nginx/bordeaux.access.log.gz combined gzip 
flush=1m;"))
       (locations common-locations)))))
 
+(define %qa.guix.gnu.org-nginx-servers
+  (list
+   (nginx-server-configuration
+    (server-name '("qa.guix.gnu.org"))
+    (listen '("80"
+              "[::]:80"))
+    (locations
+     (list
+      (nginx-location-configuration
+       (uri "/")
+       (body '(("return 301 https://$host$request_uri;";))))
+      (nginx-location-configuration  ; For use by Certbot
+       (uri "/.well-known")
+       (body '(("root /var/www;")))))))
+
+   (nginx-server-configuration
+    (server-name '("qa.guix.gnu.org"))
+    (listen '("443 ssl"
+              "[::]:443 ssl"))
+    (ssl-certificate
+     "/etc/letsencrypt/live/qa.guix.gnu.org/fullchain.pem")
+    (ssl-certificate-key
+     "/etc/letsencrypt/live/qa.guix.gnu.org/privkey.pem")
+    (raw-content
+     (list
+      %common-tls-options
+      "access_log  /var/log/nginx/qa.access.log;"))
+    (locations
+     (list
+      (nginx-location-configuration
+       (uri "/")
+       (body '("proxy_pass http://qa-frontpage;";
+               "proxy_http_version 1.1;"
+               "proxy_set_header Connection \"\";"))))))))
+
 
 (define %guix-build-coordinator-configuration
   (let* ((data.guix.gnu.org-build-event-destination
@@ -1045,7 +1083,10 @@ add_header Content-Type text/plain;")))
                          "keepalive_requests 10000;")))
                      (nginx-upstream-configuration
                       (name "nar-storage")
-                      (servers '("bishan.guix.gnu.org:443")))))
+                      (servers '("bishan.guix.gnu.org:443")))
+                     (nginx-upstream-configuration
+                      (name "qa-frontpage")
+                      (servers '("localhost:8765")))))
               (server-blocks
                (append %hpc.guix.info-nginx-servers
                        %guix-hpc.bordeaux.inria.fr-nginx-servers
@@ -1053,6 +1094,7 @@ add_header Content-Type text/plain;")))
                        %logs.guix.gnu.org-nginx-servers
                        %bayfront.guix.gnu.org-nginx-servers
                        %bordeaux.guix.gnu.org-nginx-servers
+                       %qa.guix.gnu.org-nginx-servers
                        %coordinator.bayfront.guix.gnu.org-nginx-servers))))
 
     (service nar-herder-service-type