X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a839868a4ce8d05946a97f83c1aa451028c07889..20e6d4524062198d6521c5e692e73c57984a322a:/cookbooks/tilecache/recipes/default.rb diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index e6028ebb5..b97ce12c8 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -77,7 +77,7 @@ template "/etc/logrotate.d/squid" do source "logrotate.squid.erb" owner "root" group "root" - mode 0644 + mode 0o644 end nginx_site "default" do @@ -90,17 +90,24 @@ end nginx_site "tile-ssl" do template "nginx_tile_ssl.conf.erb" - variables :certificate => certificate, :resolvers => resolvers, :renders => tilerenders + variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches end service "nginx-certificate-restart" do service_name "nginx" action :nothing subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]" - subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]" + subscribes :restart, "file[/etc/ssl/certs/#{certificate}.pem]" subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]" end +template "/etc/logrotate.d/nginx" do + source "logrotate.nginx.erb" + owner "root" + group "root" + mode 0o644 +end + tilerenders.each do |render| munin_plugin "ping_#{render[:fqdn]}" do target "ping_"