X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f601fd4a5494b22aba8edc3085a338feb67a9a2e..184a48717ac0a4332b426980a0d48771ec7fed64:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index d1486adcf..13f752cd1 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,12 +17,16 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificate] = node[:ssl][:certificate] | [ "tile.openstreetmap" ]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
 
 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] }
 
 tilecaches.each do |cache|
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
@@ -42,14 +46,23 @@ tilecaches.each do |cache|
       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"
-  variables :caches => tilecaches
+  variables :caches => tilecaches, :renders => tilerenders
 end
 
 template "/etc/logrotate.d/squid" do
@@ -59,3 +72,18 @@ template "/etc/logrotate.d/squid" do
   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