X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/336837bd1b1dc0531faa2586a12be50710618ba2..1fb771a75fb2aa2932b5afce2b424e3f86791bc2:/cookbooks/nginx/recipes/default.rb

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index ae6fb2362..a55dc14be 100644
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,31 +17,31 @@
 # limitations under the License.
 #
 
-package "nginx"
+include_recipe "apt"
+include_recipe "munin"
 
-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
+package "nginx"
 
 template "/etc/nginx/nginx.conf" do
   source "nginx.conf.erb"
   owner "root"
   group "root"
   mode 0o644
-  variables :resolvers => resolvers
 end
 
-directory "/var/cache/nginx/fastcgi-cache" do
+directory node[:nginx][:cache][:fastcgi][:directory] do
   owner "www-data"
   group "root"
   mode 0o755
+  recursive true
   only_if { node[:nginx][:cache][:fastcgi][:enable] }
 end
 
-directory "/var/cache/nginx/proxy-cache" do
+directory node[:nginx][:cache][:proxy][:directory] do
   owner "www-data"
   group "root"
   mode 0o755
+  recursive true
   only_if { node[:nginx][:cache][:proxy][:enable] }
 end