Import os

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 994c6104aaf4cea4885362563d9108ca42ef371b..3417708f33835623efb0846c6ec747b3b454e90b 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -113,12 +113,16 @@ ssl_certificate "tile.openstreetmap.org" do
   domains ["tile.openstreetmap.org",
            "a.tile.openstreetmap.org",
            "b.tile.openstreetmap.org",
   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
 
   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
 
   variables :caches => tilecaches
 end
 


@@ -136,7 +140,3 @@ tilerenders.each do |render|
     conf_variables :host => render[:fqdn]
   end
 end
     conf_variables :host => render[:fqdn]
   end
 end

-
-Dir.glob("/var/log/nginx/access.log*") do |log|
-  File.unlink(log)
-end