cbaines pushed a commit to branch master
in repository maintenance.
commit d3627a9d877a40b357739aa9c21753fd14f43227
Author: Christopher Baines <m...@cbaines.net>
AuthorDate: Thu Apr 13 18:57:23 2023 +0100
hydra: bayfront: Alter bordeaux.guix.gnu.org.
Use a new prototype frontend rather than a static webpage.
* hydra/bayfront.scm (%bordeaux.guix.gnu.org-nginx-servers): Proxy
requests to the new frontend and use a standard root.
(host-name): Include the bffe upstream.
---
hydra/bayfront.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 4c38897..616d26b 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -677,14 +677,25 @@ add_header Content-Type text/plain;")))
(body '("alias /var/lib/guix-build-coordinator/build-logs/$1/log;"
"add_header Content-Type 'text/plain; charset=UTF-8';"
"gzip_static always;"
- "gunzip on;"))))))
+ "gunzip on;")))
+ (nginx-location-configuration
+ (uri "/")
+ (body '("proxy_pass http://bffe;";
+ "proxy_http_version 1.1;"
+ "proxy_set_header Connection \"\";")))
+ (nginx-location-configuration
+ (uri "/events")
+ (body '("proxy_pass http://bffe;";
+ "proxy_http_version 1.1;"
+ "proxy_buffering off;"
+ "proxy_set_header Connection \"\";"))))))
(list
(nginx-server-configuration
(server-name '("bordeaux.guix.gnu.org"))
(listen '("80 reuseport"
"[::]:80 reuseport"))
- (root (local-file "nginx/html/bordeaux" #:recursive? #t))
+ (root "/srv/bordeaux.guix.gnu.org")
(raw-content
'("access_log /var/log/nginx/bordeaux.access.log.gz combined gzip
flush=1m;"))
(locations
@@ -699,7 +710,7 @@ add_header Content-Type text/plain;")))
(server-name '("bordeaux.guix.gnu.org"))
(listen '("443 ssl reuseport"
"[::]:443 ssl reuseport"))
- (root (local-file "nginx/html/bordeaux" #:recursive? #t))
+ (root "/srv/bordeaux.guix.gnu.org")
(ssl-certificate
"/etc/letsencrypt/live/bordeaux.guix.gnu.org/fullchain.pem")
(ssl-certificate-key
@@ -1169,6 +1180,9 @@ add_header Content-Type text/plain;")))
(nginx-upstream-configuration
(name "qa-frontpage")
(servers '("localhost:8765")))
+ (nginx-upstream-configuration
+ (name "bffe")
+ (servers '("localhost:8767")))
(nginx-upstream-configuration
(name "packages")
(servers '("localhost:3000")))))
