X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/491b5238b1afee01db317c224414ac593848bd39..d58f3441d7d4e786bb81f1ad5ab935bb54af8e56:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 687478e58..1aad4b9ff 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,12 +17,21 @@
 # limitations under the License.
 #
 
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
+require "ipaddr"
+
+certificate = node[:tilecache][:ssl][:certificate]
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ certificate ]
 
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 
+package "apache2" do
+  action :remove
+end
+
+package "xz-utils"
+
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 tilerenders = search(:node, "roles:tile").sort_by { |n| n[:hostname] }
 
@@ -44,7 +53,16 @@ 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
@@ -62,10 +80,30 @@ template "/etc/logrotate.d/squid" do
 end
 
 nginx_site "default" do
-  action :delete
+  action [ :delete ]
+end
+
+resolvers = node[:networking][:nameservers].map do |resolver|
+  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : "#{resolver}"
 end
 
 nginx_site "tile-ssl" do
-  source "nginx_tile_ssl.conf.erb"
+  template "nginx_tile_ssl.conf.erb"
+  variables :certificate => certificate, :resolvers => resolvers
 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