Revert "Switch web site to use MapQuest Nominatim for search"

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index d1486adcf4be06f69bfd92f1f145ae4209a3f811..4711428a20343525b703bd2b1c01fb9ba74915dd 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,12 +17,17 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:ssl][:certificate] = node[:ssl][:certificate] | [ "tile.openstreetmap" ]
+certificate = node[:tilecache][:ssl][:certificate]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]

 
 include_recipe "ssl"
 include_recipe "squid"
 
 include_recipe "ssl"
 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|
 
 tilecaches.each do |cache|
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|


@@ -42,14 +47,23 @@ 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
 
 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
 end
 
 template "/etc/logrotate.d/squid" do


@@ -59,3 +73,27 @@ template "/etc/logrotate.d/squid" do
   mode 0644
 end
 
   mode 0644
 end
 

+nginx_site "default" do
+  action [ :delete ]
+end
+
+nginx_site "tile-ssl" do
+  template "nginx_tile_ssl.conf.erb"
+  variables :certificate => certificate
+end
+
+service "nginx-certificate-restart" do
+  service_name "nginx"
+  action :nothing
+  subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
+  subscribes :restart, "cookbook_file[/etc/ssl/certs/#{certificate}.pem]"
+  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
+end
+
+tilerenders.each do |render|
+  munin_plugin "ping_#{render[:fqdn]}" do
+    target "ping_"
+    conf "munin.ping.erb"
+    conf_variables :host => render[:fqdn]
+  end
+end