X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7887d6f07bb4644a0846e901e220157bee2fb370..e3937af5494b6c184f9372bbc9a6014135afedfb:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 7feb45fc9..b6db40164 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,9 +17,16 @@
 # limitations under the License.
 #
 
+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|
@@ -39,12 +46,37 @@ 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
+  source "logrotate.squid.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+nginx_site "default" do
+  action [ :delete ]
+end
+
+nginx_site "tile-ssl" do
+  template "nginx_tile_ssl.conf.erb"
+end
+