guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: hydra: bayfront: Add initial configuration for pa


From: Christopher Baines
Subject: branch master updated: hydra: bayfront: Add initial configuration for packages.guix.gnu.org.
Date: Sat, 19 Nov 2022 05:50:23 -0500

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 8bfd673  hydra: bayfront: Add initial configuration for 
packages.guix.gnu.org.
8bfd673 is described below

commit 8bfd6737611e200926817d3c9873b8c29b8ad69e
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sat Nov 19 10:48:36 2022 +0000

    hydra: bayfront: Add initial configuration for packages.guix.gnu.org.
    
    This is currently serving
    https://codeberg.org/luis-felipe/guix-packages-website
    
    Currently it's running in a screen session, pending setting it up as a
    proper service.
    
    * hydra/bayfront.scm (%certbot-configuration): Add
    packages.guix.gnu.org certificate.
    (%packages.guix.gnu.org-nginx-servers): New variable.
    [services]: Add packages nginx upstream block and include packages
    servers.
---
 hydra/bayfront.scm | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 203c1a3..bebb9da 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 '("packages.guix.gnu.org"))
+           (deploy-hook %nginx-deploy-hook))
           (certificate-configuration
            (domains '("qa.guix.gnu.org"))
            (deploy-hook %nginx-deploy-hook))
@@ -751,6 +754,41 @@ add_header Content-Type text/plain;")))
                "proxy_http_version 1.1;"
                "proxy_set_header Connection \"\";"))))))))
 
+(define %packages.guix.gnu.org-nginx-servers
+  (list
+   (nginx-server-configuration
+    (server-name '("packages.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 '("packages.guix.gnu.org"))
+    (listen '("443 ssl"
+              "[::]:443 ssl"))
+    (ssl-certificate
+     "/etc/letsencrypt/live/packages.guix.gnu.org/fullchain.pem")
+    (ssl-certificate-key
+     "/etc/letsencrypt/live/packages.guix.gnu.org/privkey.pem")
+    (raw-content
+     (list
+      %common-tls-options
+      "access_log  /var/log/nginx/packages.access.log;"))
+    (locations
+     (list
+      (nginx-location-configuration
+       (uri "/")
+       (body '("proxy_pass http://packages;";
+               "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
@@ -1119,7 +1157,10 @@ add_header Content-Type text/plain;")))
                       (servers '("bishan.guix.gnu.org:443")))
                      (nginx-upstream-configuration
                       (name "qa-frontpage")
-                      (servers '("localhost:8765")))))
+                      (servers '("localhost:8765")))
+                     (nginx-upstream-configuration
+                      (name "packages")
+                      (servers '("localhost:3000")))))
               (server-blocks
                (append %guix.gnu.org-http-nginx-servers
                        %hpc.guix.info-nginx-servers
@@ -1129,6 +1170,7 @@ add_header Content-Type text/plain;")))
                        %bayfront.guix.gnu.org-nginx-servers
                        %bordeaux.guix.gnu.org-nginx-servers
                        %qa.guix.gnu.org-nginx-servers
+                       %packages.guix.gnu.org-nginx-servers
                        %coordinator.bayfront.guix.gnu.org-nginx-servers))))
 
     (service nar-herder-service-type



reply via email to

[Prev in Thread] Current Thread [Next in Thread]