From 64fbfb49237278323aaf9b66d8d9fae7b88258e2 Mon Sep 17 00:00:00 2001 From: Barracuda Team Date: Mon, 18 Jul 2016 23:26:46 +0200 Subject: [PATCH] Nginx: Improve fastcgi_cache_valid TTL settings --- http/Provision/Config/Nginx/Inc/vhost_include.tpl.php | 14 +++++++------- http/Provision/Config/Nginx/subdir.tpl.php | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/http/Provision/Config/Nginx/Inc/vhost_include.tpl.php b/http/Provision/Config/Nginx/Inc/vhost_include.tpl.php index 1f5f5e3..fb2d14a 100644 --- a/http/Provision/Config/Nginx/Inc/vhost_include.tpl.php +++ b/http/Provision/Config/Nginx/Inc/vhost_include.tpl.php @@ -1081,9 +1081,10 @@ location ~ ^/(?esi/.*)"$ { fastcgi_cache speed; fastcgi_cache_methods GET HEAD; fastcgi_cache_min_uses 1; - fastcgi_cache_key "$is_bot$device$host$request_method$uri$is_args$args$cache_uid$http_x_forwarded_proto"; - fastcgi_cache_valid 200 301 404 5s; - fastcgi_cache_valid 302 1m; + fastcgi_cache_key "$scheme$is_bot$device$host$request_method$key_uri$cache_uid$http_x_forwarded_proto$sent_http_x_local_proto$cookie_respimg"; + fastcgi_cache_valid 200 5s; + fastcgi_cache_valid 301 1m; + fastcgi_cache_valid 302 403 404 1s; fastcgi_cache_lock on; fastcgi_ignore_headers Cache-Control Expires; fastcgi_pass_header Set-Cookie; @@ -1237,11 +1238,10 @@ location = /index.php { fastcgi_cache speed; fastcgi_cache_methods GET HEAD; ### Nginx default, but added for clarity fastcgi_cache_min_uses 1; - fastcgi_cache_key "$is_bot$device$host$request_method$key_uri$cache_uid$http_x_forwarded_proto$sent_http_x_local_proto$cookie_respimg"; + fastcgi_cache_key "$scheme$is_bot$device$host$request_method$key_uri$cache_uid$http_x_forwarded_proto$sent_http_x_local_proto$cookie_respimg"; fastcgi_cache_valid 200 10s; - fastcgi_cache_valid 302 1m; - fastcgi_cache_valid 301 403 404 5s; - fastcgi_cache_valid 500 502 503 504 1s; + fastcgi_cache_valid 301 1m; + fastcgi_cache_valid 302 403 404 1s; fastcgi_cache_lock on; fastcgi_ignore_headers Cache-Control Expires; fastcgi_pass_header Set-Cookie; diff --git a/http/Provision/Config/Nginx/subdir.tpl.php b/http/Provision/Config/Nginx/subdir.tpl.php index 8dd1f7c..276865d 100644 --- a/http/Provision/Config/Nginx/subdir.tpl.php +++ b/http/Provision/Config/Nginx/subdir.tpl.php @@ -1070,11 +1070,10 @@ location ^~ / { fastcgi_cache speed; fastcgi_cache_methods GET HEAD; ### Nginx default, but added for clarity fastcgi_cache_min_uses 1; - fastcgi_cache_key "$is_bot$device$host$request_method$key_uri$cache_uid$http_x_forwarded_proto$sent_http_x_local_proto$cookie_respimg"; + fastcgi_cache_key "$scheme$is_bot$device$host$request_method$key_uri$cache_uid$http_x_forwarded_proto$sent_http_x_local_proto$cookie_respimg"; fastcgi_cache_valid 200 10s; - fastcgi_cache_valid 302 1m; - fastcgi_cache_valid 301 403 404 5s; - fastcgi_cache_valid 500 502 503 504 1s; + fastcgi_cache_valid 301 1m; + fastcgi_cache_valid 302 403 404 1s; fastcgi_cache_lock on; fastcgi_ignore_headers Cache-Control Expires; fastcgi_pass_header Set-Cookie; -- 2.7.4 (Apple Git-66)