From: Grant Slater Date: Thu, 20 Jun 2013 16:11:28 +0000 (+0100) Subject: Teach tilecache cookbook to return caches sorted (deterministic) X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/8d66a30c923fe2c0b25fb1e72677b5f9f19d6333 Teach tilecache cookbook to return caches sorted (deterministic) --- diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index 23edf0155..b97f2d43c 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -19,7 +19,11 @@ include_recipe "squid" -tilecaches = search(:node, "roles:tilecache") +expiry_time = 14 * 86400 + +tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| + { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] } +end squid_fragment "tilecache" do template "squid.conf.erb"