X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/712d39df1c611ad94fe44b4db1a88b71394ffd95..4681fcf41b24233620990cfb83b0a7077d1aa9e7:/cookbooks/nginx/recipes/default.rb?ds=inline diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index 54a9b7524..b61ba5d46 100644 --- a/cookbooks/nginx/recipes/default.rb +++ b/cookbooks/nginx/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -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/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 -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 - 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