Rework tile cache logging to avoid duplication

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index df4e76f43511f44f06d4f949ebc1401b78fbe099..0a02e1567edfac8c19ce52df47e44b55b724685d 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -19,9 +19,6 @@
 
 require "ipaddr"
 
-certificate = node[:tilecache][:ssl][:certificate]
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
-
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
@@ -114,17 +111,17 @@ execute "execute_nginx_generate_tilecache_qos_map" do
   action :run
 end
 
-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
+ssl_certificate "tile.openstreetmap.org" do
+  domains ["tile.openstreetmap.org",
+           "a.tile.openstreetmap.org",
+           "b.tile.openstreetmap.org",
+           "c.tile.openstreetmap.org"]
+  notifies :restart, "service[nginx]"
 end
 
-service "nginx-certificate-restart" do
-  service_name "nginx"
-  action :nothing
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
-  subscribes :restart, "file[/etc/ssl/certs/#{certificate}.pem]"
-  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
+nginx_site "tile-ssl" do
+  template "nginx_tile_ssl.conf.erb"
+  variables :resolvers => resolvers, :caches => tilecaches
 end
 
 template "/etc/logrotate.d/nginx" do
@@ -141,3 +138,7 @@ tilerenders.each do |render|
     conf_variables :host => render[:fqdn]
   end
 end
+
+Dir.glob("/var/log/nginx/access.log*") do |log|
+  File.unlink(log)
+end