Rework certificate handling

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 5b44be21f313db1cb067862da07f61062bd50b13..d1486adcf4be06f69bfd92f1f145ae4209a3f811 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,11 +17,45 @@
 # limitations under the License.
 #
 
+node.default[:ssl][:certificate] = node[:ssl][:certificate] | [ "tile.openstreetmap" ]
+
+include_recipe "ssl"
 include_recipe "squid"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
+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
+