Qualify property access

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

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 54a9b7524b0953096754921167cdd845115f7352..0c97546bde42f62777e8f7f2f3f6847fcf0924fd 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -25,27 +25,25 @@ template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
   source "nginx.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 end
 

-if node['nginx']['cache']['fastcgi']['enable']
-  directory "/var/cache/nginx/fastcgi-cache" do
-    owner "www-data"
-    group "root"
-    mode 0755
-  end
+directory "/var/cache/nginx/fastcgi-cache" do
+  owner "www-data"
+  group "root"
+  mode 0o755
+  only_if { node[:nginx][:cache][:fastcgi][:enable] }

 end
 
 end
 

-if node['nginx']['cache']['proxy']['enable']
-  directory "/var/cache/nginx/proxy-cache" do
-    owner "www-data"
-    group "root"
-    mode 0755
-  end
+directory "/var/cache/nginx/proxy-cache" do
+  owner "www-data"
+  group "root"
+  mode 0o755
+  only_if { node[:nginx][:cache][:proxy][:enable] }

 end
 
 service "nginx" do
 end
 
 service "nginx" do

-  action [:enable]
+  action [:enable] # Do not start the service as config may be broken from failed chef run

   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end