[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: bayfront: Make cuirass the homepage.
|
From: |
Andreas Enge |
|
Subject: |
01/01: bayfront: Make cuirass the homepage. |
|
Date: |
Mon, 2 Dec 2019 10:28:29 -0500 (EST) |
andreas pushed a commit to branch master
in repository maintenance.
commit 97a0442bf418ec6e96bf906bacf6cfd6dc4cf373
Author: Andreas Enge <address@hidden>
Date: Mon Dec 2 16:21:54 2019 +0100
bayfront: Make cuirass the homepage.
* hydra/nginx/bayfront-locations.conf: Proxy / to localhost:8081, then
disable the admin interface.
* hydra/bayfront.scm (%nginx-config): Drop the reference to index.html.
* hydra/nginx/html/index.html: Remove file.
---
hydra/bayfront.scm | 5 +----
hydra/nginx/bayfront-locations.conf | 18 +++++++-----------
hydra/nginx/html/index.html | 25 -------------------------
3 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 596eb52..9333cea 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -52,10 +52,7 @@
"guix-hpc-locations.conf")
(copy-file #$(local-file
"nginx/guix-hpc-inria-locations.conf")
- "guix-hpc-inria-locations.conf")
- (substitute* "bayfront-locations.conf"
- (("@WWWROOT@")
- #$(local-file "nginx/html" #:recursive? #t)))))))
+ "guix-hpc-inria-locations.conf")))))
(define %nginx-deploy-hook
;; Hook that restarts nginx when a new certificate is deployed.
diff --git a/hydra/nginx/bayfront-locations.conf
b/hydra/nginx/bayfront-locations.conf
index 5b1e538..dc47eb9 100644
--- a/hydra/nginx/bayfront-locations.conf
+++ b/hydra/nginx/bayfront-locations.conf
@@ -1,13 +1,15 @@
# Configuration of the various HTTP locations.
# This file is meant to be included in the bayfront configuration file.
-location = / {
- # Make sure index.html lives in there.
- root @WWWROOT@;
+location / {
+ proxy_pass http://localhost:8081;
}
-location = /index.html {
- root @WWWROOT@;
+location ~ ^/admin {
+ if ($ssl_client_verify != SUCCESS) {
+ return 403;
+ }
+ proxy_pass http://localhost:8081;
}
location = /nix-cache-info {
@@ -123,12 +125,6 @@ location /file/ {
proxy_ignore_client_abort on;
}
-# Cuirass.
-location /specifications { proxy_pass http://localhost:8081; }
-location /jobsets { proxy_pass http://localhost:8081; }
-location /build { proxy_pass http://localhost:8081; }
-location /api { proxy_pass http://localhost:8081; }
-
# For use by Certbot.
location /.well-known {
root /var/www;
diff --git a/hydra/nginx/html/index.html b/hydra/nginx/html/index.html
deleted file mode 100644
index c0a31d4..0000000
--- a/hydra/nginx/html/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
- <head>
- <title>GNU Guix Substitute Mirror</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta name="keywords" content="GNU Guix, substitutes, mirror">
- </head>
-
- <body>
- <h1>GNU Guix Substitute Mirror</h1>
-
- <p>
- Welcome! This is your
- fast & friendly <a
href="https://www.gnu.org/software/guix/";>GNU Guix</a>
- mirror of the
- <a
href="https://www.gnu.org/software/guix/manual/html_node/Substitutes.html";>substitutes</a>
- served
- by <a href="https://hydra.gnu.org";><tt>hydra.gnu.org</tt></a>.
- </p>
- <p>
- To use it, just run <tt>guix-daemon</tt> or other <tt>guix</tt>
- commands
- with <tt>--substitute-urls=https://mirror.guixsd.org</tt>.
- </p>
- </body>
-</html>