Fix nginx cache paths

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index a5d06e1c0c3a0f646b8820048c2e6e2b0de53ef2..54a9b7524b0953096754921167cdd845115f7352 100644 (file)
--- 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 2099e8354641a96841ba88ff604c615c8a232748..a475f166c7297830b6efe93516a6b943916765d1 100644 (file)
--- 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;