02/02: nginx: bayfront: Let 'Cache-Control' headers through.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit b766b015c25ad37b3766148f69048f6ae40024eb
Author: Ludovic Courtès <address@hidden>
Date:   Fri May 5 13:48:24 2017 +0200

    nginx: bayfront: Let 'Cache-Control' headers through.
    
    * hydra/nginx/bayfront-locations.conf (\.narinfo): Add
    'proxy_pass_header' directive; remove 'proxy_ignore_headers'.
---
 hydra/nginx/bayfront-locations.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hydra/nginx/bayfront-locations.conf 
b/hydra/nginx/bayfront-locations.conf
index 3873e40..0fb3b60 100644
--- a/hydra/nginx/bayfront-locations.conf
+++ b/hydra/nginx/bayfront-locations.conf
@@ -78,8 +78,11 @@ location ~ \.narinfo$ {
     proxy_cache_valid 504 5m;  # timeout, when hydra.gnu.org is overloaded
     proxy_cache_valid any 2m;   # cache misses/others for 2m
 
-    # Use the above TTLs, not those advertised by hydra.gnu.org.
-    proxy_ignore_headers Expires Cache-Control;
+    # 'guix publish --ttl' produces a 'Cache-Control' header for use
+    # by 'guix substitute'.  Let it through rather than use nginx's
+    # "expire" directive since the expiration time defined by 'guix
+    # publish' is the right one.
+    proxy_pass_header Cache-Control;
 
     proxy_ignore_client_abort on;