Install curl and subversion for taginfo

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 18aa14e145fc771fa638575ba199f8b01a233a5a..13f752cd1382c6527ea299cc906c254474bfd037 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,14 +17,22 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
+
+include_recipe "ssl"

 include_recipe "squid"
 include_recipe "squid"

+include_recipe "nginx"
+
+package "xz-utils"

 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }

+tilerenders = search(:node, "roles:tile").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
 
 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"
       source "net:#{address}"
       dest "fw"
       proto "tcp:syn"


@@ -33,16 +41,49 @@ tilecaches.each do |cache|
     end
     firewall_rule "accept-squid-icp" do
       action :accept
     end
     firewall_rule "accept-squid-icp" do
       action :accept

+      family "inet"

       source "net:#{address}"
       dest "fw"
       proto "udp"
       dest_ports "3130"
       source "net:#{address}"
       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
 
 squid_fragment "tilecache" do
   template "squid.conf.erb"
     end
   end
 end
 
 squid_fragment "tilecache" do
   template "squid.conf.erb"

-  variables :caches => tilecaches
+  variables :caches => tilecaches, :renders => tilerenders
+end
+
+template "/etc/logrotate.d/squid" do
+  source "logrotate.squid.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+nginx_site "default" do
+  action [ :delete ]
+end
+
+nginx_site "tile-ssl" do
+  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
 end