X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..da6d22184fadab2377330cc59d6699011ad2dda8:/cookbooks/tilecache/recipes/default.rb diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index f3b8382fb..63de8a529 100644 --- a/cookbooks/tilecache/recipes/default.rb +++ b/cookbooks/tilecache/recipes/default.rb @@ -22,6 +22,7 @@ require "ipaddr" include_recipe "ssl" include_recipe "squid" include_recipe "nginx" +include_recipe "fail2ban" package "apache2" do action :remove @@ -51,6 +52,7 @@ tilecaches.each do |cache| dest_ports "3128" source_ports "1024:" end + firewall_rule "accept-squid-icp" do action :accept family "inet" @@ -60,6 +62,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 +72,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 +109,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 +168,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_"