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 e1f8f99b hydra: Reorder some NGinx configuration lines.
e1f8f99b is described below
commit e1f8f99b4a05f6c075dfa9f0b47a7ea973b1aaff
Author: Christopher Baines <m...@cbaines.net>
AuthorDate: Wed Jun 5 14:37:30 2024 +0100
hydra: Reorder some NGinx configuration lines.
I think that having set before rewrite might be important for it to
work.
* hydra/bayfront.scm (%bordeaux.guix.gnu.org-nginx-servers): Reorder
some NGinx configuration lines.
* hydra/deploy-node-129.scm (%nginx-server-blocks): Reorder some NGinx
configuration lines.
---
hydra/bayfront.scm | 8 ++++----
hydra/deploy-node-129.scm | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 2916e0b2..552665a6 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -833,18 +833,18 @@ add_header Content-Type text/plain;")))
(body '("proxy_pass https://nar-storage;";)))
(nginx-named-location-configuration
(name "nar-storage")
- (body '("rewrite /internal/(.*) /$1 break;"
- "proxy_pass https://nar-storage;";
+ (body '("proxy_http_version 1.1;"
"
if ($http_via) {
set $via \"$http_via, $via\";
}
proxy_set_header Via $via;"
"proxy_cache bordeaux-nar;"
- "proxy_http_version 1.1;"
"proxy_set_header Connection \"\";"
"proxy_cache_valid 200 28d;"
- "proxy_ignore_client_abort on;")))
+ "proxy_ignore_client_abort on;"
+ "rewrite /internal/(.*) /$1 break;"
+ "proxy_pass https://nar-storage;";)))
(nginx-location-configuration
(uri "= /latest-database-dump")
(body '("proxy_pass http://nar-herder;";
diff --git a/hydra/deploy-node-129.scm b/hydra/deploy-node-129.scm
index 989d1b14..f8f9c3df 100644
--- a/hydra/deploy-node-129.scm
+++ b/hydra/deploy-node-129.scm
@@ -82,14 +82,14 @@
(body '("proxy_pass http://nar-herder;";)))
(nginx-named-location-configuration
(name "nar-storage-location")
- (body '("rewrite /internal/(.*) /$1 break;"
- "proxy_pass https://nar-storage;";
- "
+ (body '("
if ($http_via) {
set $via \"$http_via, $via\";
}
proxy_set_header Via $via;"
- "proxy_set_header Host bordeaux.guix.gnu.org:443;")))
+ "proxy_set_header Host bordeaux.guix.gnu.org:443;"
+ "rewrite /internal/(.*) /$1 break;"
+ "proxy_pass https://nar-storage;";)))
(nginx-location-configuration
(uri "= /latest-database-dump")
(body '("proxy_pass http://nar-herder;";)))
