tilecache: nginx tweak

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 19a475cd3103fefa9a1190c23d24cf5df7c52471..aec5170257362b4386530eb7c757b3008fc003fc 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -21,8 +21,10 @@ node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstre
 
 include_recipe "ssl"
 include_recipe "squid"
+include_recipe "nginx"
 
 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|
@@ -49,7 +51,7 @@ 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 +61,11 @@ 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
+