Manage c3sl remote hands account

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 728d26f49a9ba54206e2f3919b5f31e3485fab56..5c4907b69c7805b98c78452a4f8c8fcb37cddeb8 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -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"
@@ -88,10 +90,6 @@ nginx_site "default" do
   action [:delete]
 end
 
-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
-
 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
@@ -117,13 +115,17 @@ 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"
-  variables :resolvers => resolvers, :caches => tilecaches
+nginx_site "tile" do
+  template "nginx_tile.conf.erb"
+  variables :caches => tilecaches
 end
 
 template "/etc/logrotate.d/nginx" do
@@ -140,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