X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..3e112e5d63c83023122e5055b82294f35d33a458:/cookbooks/tilecache/recipes/default.rb?ds=inline

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 0d94bcfd2..5c4907b69 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -77,6 +77,8 @@ squid_fragment "tilecache" do
   variables :caches => tilecaches, :renders => tilerenders
 end
 
+package "rsync"
+
 template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
@@ -113,12 +115,16 @@ ssl_certificate "tile.openstreetmap.org" do
   domains ["tile.openstreetmap.org",
            "a.tile.openstreetmap.org",
            "b.tile.openstreetmap.org",
-           "c.tile.openstreetmap.org"]
+           "c.tile.openstreetmap.org",
+           "tile.osm.org",
+           "a.tile.osm.org",
+           "b.tile.osm.org",
+           "c.tile.osm.org"]
   notifies :restart, "service[nginx]"
 end
 
-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
+nginx_site "tile" do
+  template "nginx_tile.conf.erb"
   variables :caches => tilecaches
 end
 
@@ -136,7 +142,3 @@ tilerenders.each do |render|
     conf_variables :host => render[:fqdn]
   end
 end
-
-Dir.glob("/var/log/nginx/access.log*") do |log|
-  File.unlink(log)
-end