nominatim: add postgres/postgis version information in local settings

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

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

-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "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"


@@ -46,7 +47,7 @@ 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
     end
     firewall_rule "accept-squid-icp-reply" do
       action :accept


@@ -55,7 +56,7 @@ tilecaches.each do |cache|
       dest "net:#{address}"
       proto "udp"
       dest_ports "3130"
       dest "net:#{address}"
       proto "udp"
       dest_ports "3130"

-      source_ports "1024:"
+      source_ports "3130"

     end
   end
 end
     end
   end
 end


@@ -78,5 +79,21 @@ end
 
 nginx_site "tile-ssl" do
   template "nginx_tile_ssl.conf.erb"
 
 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
 
 end
 

+tilerenders.each do |render|
+  munin_plugin "ping_#{render[:fqdn]}" do
+    target "ping_"
+    conf "munin.ping.erb"
+    conf_variables :host => render[:fqdn]
+  end
+end