02/03: hydra: bayfront: Add nginx server block for http://guix.gnu.org.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit fc455367f3f3dc5d446026810770ecc7933f3914
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Nov 18 11:25:37 2022 +0100

    hydra: bayfront: Add nginx server block for http://guix.gnu.org.
    
    * hydra/bayfront.scm (%guix.gnu.org-http-nginx-servers): New variable.
    <services>: Add it to the 'nginx-configuration'.
---
 hydra/bayfront.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index fec6b97..2c8f9f2 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -751,6 +751,14 @@ add_header Content-Type text/plain;")))
                "proxy_http_version 1.1;"
                "proxy_set_header Connection \"\";"))))))))
 
+(define %guix.gnu.org-http-nginx-servers
+  ;; Redirect domains that don't explicitly support HTTP (below) to HTTPS.
+  (list (nginx-server-configuration
+         (listen '("80"))
+         (server-name '("guix.gnu.org"))
+         (raw-content
+          (list "return 308 https://$host$request_uri;";)))))
+
 
 (define %guix-build-coordinator-configuration
   (let* ((data.guix.gnu.org-build-event-destination
@@ -1113,7 +1121,8 @@ add_header Content-Type text/plain;")))
                       (name "qa-frontpage")
                       (servers '("localhost:8765")))))
               (server-blocks
-               (append %hpc.guix.info-nginx-servers
+               (append %guix.gnu.org-http-nginx-servers
+                       %hpc.guix.info-nginx-servers
                        %guix-hpc.bordeaux.inria.fr-nginx-servers
                        %ten-years-of-guix-nginx-servers
                        %logs.guix.gnu.org-nginx-servers