X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..ba65c5618d3113373c0f3306ce993917fc2af23a:/cookbooks/tilecache/recipes/default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index f3b8382fb..1cf0e7b2e 100644
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -19,9 +19,11 @@
 
 require "ipaddr"
 
-include_recipe "ssl"
-include_recipe "squid"
+include_recipe "fail2ban"
+include_recipe "munin"
 include_recipe "nginx"
+include_recipe "squid"
+include_recipe "ssl"
 
 package "apache2" do
   action :remove
@@ -51,6 +53,7 @@ tilecaches.each do |cache|
       dest_ports "3128"
       source_ports "1024:"
     end
+
     firewall_rule "accept-squid-icp" do
       action :accept
       family "inet"
@@ -60,6 +63,7 @@ tilecaches.each do |cache|
       dest_ports "3130"
       source_ports "3130"
     end
+
     firewall_rule "accept-squid-icp-reply" do
       action :accept
       family "inet"
@@ -69,6 +73,26 @@ tilecaches.each do |cache|
       dest_ports "3130"
       source_ports "3130"
     end
+
+    firewall_rule "accept-squid-htcp" do
+      action :accept
+      family "inet"
+      source "net:#{address}"
+      dest "fw"
+      proto "udp"
+      dest_ports "4827"
+      source_ports "4827"
+    end
+
+    firewall_rule "accept-squid-htcp-reply" do
+      action :accept
+      family "inet"
+      source "fw"
+      dest "net:#{address}"
+      proto "udp"
+      dest_ports "4827"
+      source_ports "4827"
+    end
   end
 end
 
@@ -86,6 +110,16 @@ template "/etc/logrotate.d/squid" do
   mode 0o644
 end
 
+# Configure cron with lower cpu and IO priority
+systemd_service "cron-load" do
+  service "cron"
+  dropin "load"
+  nice 19
+  io_scheduling_class "best-effort"
+  io_scheduling_priority 7
+  notifies :restart, "service[cron]"
+end
+
 nginx_site "default" do
   action [:delete]
 end
@@ -135,6 +169,10 @@ template "/etc/logrotate.d/nginx" do
   mode 0o644
 end
 
+fail2ban_jail "squid" do
+  maxretry 1000
+end
+
 tilerenders.each do |render|
   munin_plugin "ping_#{render[:fqdn]}" do
     target "ping_"