01/01: hydra: nginx: hydra.gnu.org redirects to ci.guix.gnu.org.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 7843334c3ab3634f6114f2a507e6cf97d89db9b6
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jun 18 14:59:18 2019 +0200

    hydra: nginx: hydra.gnu.org redirects to ci.guix.gnu.org.
    
    * hydra/nginx/hydra.gnu.org-locations.conf (/, /api, /eval)
    (/evals, /jobset, /build, /status, ^/nar/(.*)$): Remove.
    (/nix-cache-info): Pass on to port 9999.
    (.): New location.
---
 hydra/nginx/hydra.gnu.org-locations.conf | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/hydra/nginx/hydra.gnu.org-locations.conf 
b/hydra/nginx/hydra.gnu.org-locations.conf
index 77eaade..6f426dc 100644
--- a/hydra/nginx/hydra.gnu.org-locations.conf
+++ b/hydra/nginx/hydra.gnu.org-locations.conf
@@ -1,23 +1,6 @@
 # Configuration of the various locations at hydra.gnu.org.
 # This file is meant to be included in the main configuration file.
 
-location / {
-    proxy_pass http://127.0.0.1:3000;
-}
-
-location /api {
-    # For the sake of the JS code at http://gnu.org/s/guix/packages.
-    add_header 'Access-Control-Allow-Origin' '$scheme://www.gnu.org';
-    proxy_pass http://127.0.0.1:3000;
-}
-
-# Longer timeouts to allow practical https access to Hydra's admin interface.
-location /eval   { proxy_pass http://127.0.0.1:3000; proxy_read_timeout 600s; }
-location /evals  { proxy_pass http://127.0.0.1:3000; proxy_read_timeout 360s; }
-location /jobset { proxy_pass http://127.0.0.1:3000; proxy_read_timeout 240s; }
-location /build  { proxy_pass http://127.0.0.1:3000; proxy_read_timeout 120s; }
-location /status { proxy_pass http://127.0.0.1:3000; proxy_read_timeout 30s; }
-
 location /guix/nar/ {
     # Served by:
     # guix publish -p 9999 --listen=127.0.0.1 -u nobody -C8 
--cache=/var/cache/guix/publish --ttl=14d --workers=2 --nar-path=guix/nar 
--public-key=/home/hydra/narinfo-key.pub 
--private-key=/home/hydra/narinfo-key.sec
@@ -45,14 +28,8 @@ location /guix/nar/ {
     gzip off;
 }
 
-location ~ ^/nar/(.*)$ {
-    # This used to be the URL for the Hydra-served nars.  Now this is
-    # simply a redirect to the 'guix publish' URLs above.
-    return 301 /guix/nar/$1;
-}
-
-location ~ /(nix-cache-info|static|logo|favicon\.ico) {
-    proxy_pass http://127.0.0.1:3000;
+location /nix-cache-info {
+    proxy_pass http://127.0.0.1:9999;
 
     # Cache this file since that's always the first thing we ask for.
     proxy_cache static;
@@ -120,3 +97,8 @@ location /file/ {
 location /.well-known {
     root /var/www;
 }
+
+# Bye bye!
+location ~ . {
+    return 301 https://ci.guix.gnu.org;
+}