Skip to content

Commit d323e99

Browse files
author
Kristan Kenney
committed
Revert "Merge branch 'cmstew-cache-improvements' into staging/fixes"
This reverts commit f9f589a.
1 parent bfdf6e8 commit d323e99

File tree

6 files changed

+2
-150
lines changed

6 files changed

+2
-150
lines changed

install/deb/nginx/nginx.conf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,6 @@ http {
131131
proxy_cache_use_stale error timeout invalid_header http_502;
132132
proxy_cache_valid any 1d;
133133

134-
# FastCGI Cache settings
135-
fastcgi_cache_path /var/cache/nginx/php-fpm levels=2 keys_zone=cache:10m inactive=60m max_size=1024m;
136-
fastcgi_cache_key "$host$request_uri $cookie_user";
137-
fastcgi_temp_path /var/cache/nginx/temp;
138-
fastcgi_ignore_headers Expires Cache-Control;
139-
fastcgi_cache_use_stale error timeout invalid_header;
140-
fastcgi_cache_valid any 1d;
141-
142134
# Cache bypass
143135
map $http_cookie $no_cache {
144136
default 0;

install/deb/templates/web/nginx/caching.stpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ server {
1717
location / {
1818
proxy_pass https://%ip%:%web_ssl_port%;
1919

20-
proxy_cache %domain%;
20+
proxy_cache cache;
2121
proxy_cache_valid 15m;
2222
proxy_cache_valid 404 1m;
2323
proxy_no_cache $no_cache;

install/deb/templates/web/nginx/caching.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ server {
1212
location / {
1313
proxy_pass http://%ip%:%web_port%;
1414
15-
proxy_cache %domain%;
15+
proxy_cache cache;
1616
proxy_cache_valid 15m;
1717
proxy_cache_valid 404 1m;
1818
proxy_no_cache $no_cache;

install/deb/templates/web/nginx/php-fpm/caching.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

install/deb/templates/web/nginx/php-fpm/caching.stpl

Lines changed: 0 additions & 63 deletions
This file was deleted.

install/deb/templates/web/nginx/php-fpm/caching.tpl

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)