From: Jon Burgess <jburgess777@gmail.com>
Date: Wed, 1 Aug 2018 21:42:32 +0000 (+0100)
Subject: Bump file limits of Nginx and Squid processes from 64k ro 96k
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/32d0a85d5b8dd9f5787bd259d7092cc84fcb9615

Bump file limits of Nginx and Squid processes from 64k ro 96k
---

diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index b42545685..429716d04 100644
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -3,7 +3,7 @@
 user  www-data;
 worker_processes auto;
 worker_cpu_affinity auto;
-worker_rlimit_nofile 65536;
+worker_rlimit_nofile 98304;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 5e07a4bdf..e26ffe2dd 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -86,7 +86,7 @@ systemd_service "squid" do
   description "Squid caching proxy"
   after ["network.target", "nss-lookup.target"]
   type "forking"
-  limit_nofile 65536
+  limit_nofile 98304
   exec_start_pre "/usr/sbin/squid -N -z"
   exec_start "/usr/sbin/squid -Y"
   exec_reload "/usr/sbin/squid -k reconfigure"
diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 659b3c8cb..918c7b531 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -3,7 +3,7 @@
 #FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
 
-max_filedescriptors 65536
+max_filedescriptors 98304
 
 #used by squidclient / munin
 http_port 3128