imagery: simplify layer/overlay code

[chef.git] / cookbooks / nginx / recipes / default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index a5d06e1c0c3a0f646b8820048c2e6e2b0de53ef2..bd104f676f11a16f6ad34d501231339e15c2f76f 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -28,20 +28,18 @@ template "/etc/nginx/nginx.conf" do
   mode 0644
 end
 
-if node['nginx']['cache']['fastcgi']['enable']
-  directory "/var/lib/nginx/fastcgi-cache" do
-    owner "nginx"
-    group "nginx"
-    mode 0755
-  end
+directory "/var/cache/nginx/fastcgi-cache" do
+  owner "www-data"
+  group "root"
+  mode 0755
+  only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
-if node['nginx']['cache']['proxy']['enable']
-  directory "/var/lib/nginx/proxy-cache" do
-    owner "nginx"
-    group "nginx"
-    mode 0755
-  end
+directory "/var/cache/nginx/proxy-cache" do
+  owner "www-data"
+  group "root"
+  mode 0755
+  only_if { node[:nginx][:cache][:proxy][:enable] }
 end
 
 service "nginx" do