tilecache: allow ICP UDP replies

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 687478e581df41c71ad7fa191fc3c4057a1819a7..209a83dc969f3166059e13f000b5303016ddb9e8 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -23,6 +23,8 @@ include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 
+package "xz-utils"
+
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
 
@@ -46,6 +48,15 @@ tilecaches.each do |cache|
       dest_ports "3130"
       source_ports "1024:"
     end
+    firewall_rule "accept-squid-icp-reply" do
+      action :accept
+      family "inet"
+      source "fw"
+      dest "net:#{address}"
+      proto "udp"
+      dest_ports "3130"
+      source_ports "1024:"
+    end
   end
 end
 
@@ -62,10 +73,10 @@ template "/etc/logrotate.d/squid" do
 end
 
 nginx_site "default" do
-  action :delete
+  action [ :delete ]
 end
 
 nginx_site "tile-ssl" do
-  source "nginx_tile_ssl.conf.erb"
+  template "nginx_tile_ssl.conf.erb"
 end