From 712d39df1c611ad94fe44b4db1a88b71394ffd95 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sun, 29 May 2016 18:38:15 +0100 Subject: [PATCH] Fix nginx cache paths --- cookbooks/nginx/recipes/default.rb | 12 ++++++------ cookbooks/nginx/templates/default/nginx.conf.erb | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index a5d06e1c0..54a9b7524 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -29,17 +29,17 @@ template "/etc/nginx/nginx.conf" do end if node['nginx']['cache']['fastcgi']['enable'] - directory "/var/lib/nginx/fastcgi-cache" do - owner "nginx" - group "nginx" + directory "/var/cache/nginx/fastcgi-cache" do + owner "www-data" + group "root" mode 0755 end end if node['nginx']['cache']['proxy']['enable'] - directory "/var/lib/nginx/proxy-cache" do - owner "nginx" - group "nginx" + directory "/var/cache/nginx/proxy-cache" do + owner "www-data" + group "root" mode 0755 end end diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb index 2099e8354..a475f166c 100644 --- a/cookbooks/nginx/templates/default/nginx.conf.erb +++ b/cookbooks/nginx/templates/default/nginx.conf.erb @@ -29,10 +29,10 @@ http { server_tokens off; <% if node['nginx']['cache']['fastcgi']['enable'] -%> - fastcgi_cache_path /var/lib/nginx/fastcgi-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['fastcgi']['keys_zone'] %> inactive=<%= node['nginx']['cache']['fastcgi']['inactive'] %> max_size=<%= node['nginx']['cache']['fastcgi']['max_size'] %>; + fastcgi_cache_path /var/cache/nginx/fastcgi-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['fastcgi']['keys_zone'] %> inactive=<%= node['nginx']['cache']['fastcgi']['inactive'] %> max_size=<%= node['nginx']['cache']['fastcgi']['max_size'] %>; <% end -%> <% if node['nginx']['cache']['proxy']['enable'] -%> - fastcgi_cache_path /var/lib/nginx/proxy-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['proxy']['keys_zone'] %> inactive=<%= node['nginx']['cache']['proxy']['inactive'] %> max_size=<%= node['nginx']['cache']['proxy']['max_size'] %>; + fastcgi_cache_path /var/cache/nginx/proxy-cache levels=1:2 keys_zone=<%= node['nginx']['cache']['proxy']['keys_zone'] %> inactive=<%= node['nginx']['cache']['proxy']['inactive'] %> max_size=<%= node['nginx']['cache']['proxy']['max_size'] %>; <% end -%> include /etc/nginx/conf.d/*.conf; -- 2.39.5