Switch tile.osm.org to letsencrypt

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index f188964796cf4929e6b86e4abfc4b3f8d3d16919..9e119321698d7406ca64067eca70eb0384e10db6 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -93,17 +93,12 @@ resolvers = node[:networking][:nameservers].map do |resolver|
   IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
 end
 
-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
-end
-
 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
   group "root"
   mode 0o750
-  variables :web_passwords => web_passwords
+  variables :totp_key => web_passwords["totp_key"]
 end
 
 template "/etc/cron.d/tilecache" do
@@ -119,12 +114,18 @@ execute "execute_nginx_generate_tilecache_qos_map" do
   action :run
 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]"
+ssl_certificate "tile.openstreetmap.org" do
+  domains ["tile.openstreetmap.org",
+           "a.tile.openstreetmap.org",
+           "b.tile.openstreetmap.org",
+           "c.tile.openstreetmap.org"]
+  fallback_certificate "tile.openstreetmap"
+  notifies :restart, "service[nginx]"
+end
+
+nginx_site "tile-ssl" do
+  template "nginx_tile_ssl.conf.erb"
+  variables :resolvers => resolvers, :caches => tilecaches
 end
 
 template "/etc/logrotate.d/nginx" do