X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/c11a84f993c9c31b7fc9e54b57191ca6492d9fd8..e5f294d3dc676675b2803915571c28337468c3b3:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index df4e76f43..a69b6ed8d 100644
--- 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"
@@ -30,8 +27,10 @@ package "apache2" do
   action :remove
 end
 
-package "xz-utils"
-package "openssl"
+package %w[
+  xz-utils
+  openssl
+]
 
 # oathtool for QoS token
 package "oathtool"
@@ -114,17 +113,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_source "nginx_tile_ssl.conf.erb"
+  variables :resolvers => resolvers, :caches => tilecaches
 end
 
 template "/etc/logrotate.d/nginx" do
@@ -141,3 +140,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