From: Tom Hughes <tom@compton.nu>
Date: Thu, 7 Jun 2018 17:36:54 +0000 (+0100)
Subject: Remove unused squid defaults file
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/bc56a313a53c8f08758739db7e68f83c7a407a35?ds=sidebyside;hp=a725f6d3959f30f6600026178192e5f237a1a805

Remove unused squid defaults file
---

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 6b2e25eff..e22b00eec 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -56,13 +56,6 @@ template "/etc/squid/squid.conf" do
   mode 0o644
 end
 
-template "/etc/default/squid" do
-  source "squid.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
@@ -110,7 +103,6 @@ service "squid" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[squid]"
   subscribes :reload, "template[/etc/squid/squid.conf]"
-  subscribes :restart, "template[/etc/default/squid]"
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
diff --git a/cookbooks/squid/templates/default/squid.erb b/cookbooks/squid/templates/default/squid.erb
deleted file mode 100644
index f6a346cbf..000000000
--- a/cookbooks/squid/templates/default/squid.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-#
-# /etc/default/squid    Configuration settings for the Squid proxy server.
-#
-
-# Max. number of filedescriptors to use. You can increase this on a busy
-# cache to a maximum of (currently) 65536 filedescriptors. Default is 1024.
-SQUID_MAXFD=65536