X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8d66a30c923fe2c0b25fb1e72677b5f9f19d6333..89a41ef0a45d66064c577adaba75663c27f2398b:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index b97f2d43c..19a475cd3 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,15 +17,45 @@
 # limitations under the License.
 #
 
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
+
+include_recipe "ssl"
 include_recipe "squid"
 
-expiry_time = 14 * 86400
+tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
-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] }
+tilecaches.each do |cache|
+  cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
+    firewall_rule "accept-squid" do
+      action :accept
+      family "inet"
+      source "net:#{address}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports "3128"
+      source_ports "1024:"
+    end
+    firewall_rule "accept-squid-icp" do
+      action :accept
+      family "inet"
+      source "net:#{address}"
+      dest "fw"
+      proto "udp"
+      dest_ports "3130"
+      source_ports "1024:"
+    end
+  end
 end
 
 squid_fragment "tilecache" do
   template "squid.conf.erb"
   variables :caches => tilecaches
 end
+
+template "/etc/logrotate.d/squid" do
+  source "logrotate.squid.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+