Stop handling X-Forwarded-For from old tile CDN

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index d31b0bc3c049fd1916e70869a16e718977d3c641..957caa8ca50dffa2dc15021a1d6cf56ebe46ea4e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -56,7 +56,6 @@ remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
   ignore_failure true
 end
 
-tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 apache_site "default" do
@@ -69,7 +68,7 @@ end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"
-  variables :caches => tilecaches, :fastly => fastlyips["addresses"]
+  variables :fastly => fastlyips["addresses"]
 end
 
 template "/etc/logrotate.d/apache2" do