This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository maintenance.
The following commit(s) were added to refs/heads/master by this push:
new 4117d54 Revert unstaged parts from berlin.
4117d54 is described below
commit 4117d547d88e0ef3d740ef72ad800cf50b9ea0c8
Author: Tobias Geerinckx-Rice <m...@tobias.gr>
AuthorDate: Fri Dec 10 18:36:57 2021 +0100
Revert unstaged parts from berlin.
This reverts parts of commit 2ec0a03774069f390a499fe93bdec6cec34819dc.
---
hydra/nginx/berlin.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index 8350723..e3ee01c 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -108,9 +108,9 @@ Allow: /$\r
;; Do not tolerate slowness of hydra.gnu.org when fetching
;; narinfos: better return 504 quickly than wait forever.
- "proxy_connect_timeout 10s;"
- "proxy_read_timeout 10s;"
- "proxy_send_timeout 10s;"
+ "proxy_connect_timeout 2s;"
+ "proxy_read_timeout 2s;"
+ "proxy_send_timeout 2s;"
;; 'guix publish --ttl' produces a 'Cache-Control' header for
;; use by 'guix substitute'. Let it through rather than use
@@ -959,6 +959,7 @@ PUBLISH-URL."
%tls-settings
(list
"add_header Content-Security-Policy \"frame-ancestors 'none'\";"
+
;; TODO This works around NGinx using the epoch for the
;; Last-Modified date, as well as the etag.
;; See http://issues.guix.gnu.org/37207
