tilecache: fix broken export acl

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 647e0dc0731a714ef76f6b1f9341b62a8853f712..13f752cd1382c6527ea299cc906c254474bfd037 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -46,7 +46,16 @@ tilecaches.each do |cache|
       dest "fw"
       proto "udp"
       dest_ports "3130"
       dest "fw"
       proto "udp"
       dest_ports "3130"

-      source_ports "1024:"
+      source_ports "3130"
+    end
+    firewall_rule "accept-squid-icp-reply" do
+      action :accept
+      family "inet"
+      source "fw"
+      dest "net:#{address}"
+      proto "udp"
+      dest_ports "3130"
+      source_ports "3130"

     end
   end
 end
     end
   end
 end


@@ -71,3 +80,10 @@ nginx_site "tile-ssl" do
   template "nginx_tile_ssl.conf.erb"
 end
 
   template "nginx_tile_ssl.conf.erb"
 end
 

+tilerenders.each do |render|
+  munin_plugin "ping_#{render[:fqdn]}" do
+    target "ping_"
+    conf "munin.ping.erb"
+    conf_variables :host => render[:fqdn]
+  end
+end