X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/aebc9980eafb3e523e36023022186a5da64ca5ac..10d285506154265fc348843350ec800aed1d74fc:/cookbooks/nginx/recipes/default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index a5d06e1c0..6e3a60ff6 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -19,33 +19,34 @@
 
 package "nginx"
 
-# admins = data_bag_item("nginx", "admins")
+resolvers = node[:networking][:nameservers].map do |resolver|
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
+end
 
 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
+  variables :resolvers => resolvers
 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 0o755
+  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 0o755
+  only_if { node[:nginx][:cache][:proxy][:enable] }
 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