projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3dec1a0
)
Remove some redundant options from squid 3 configuration
author
Tom Hughes
<tom@compton.nu>
Thu, 7 Jun 2018 17:44:27 +0000
(18:44 +0100)
committer
Tom Hughes
<tom@compton.nu>
Thu, 7 Jun 2018 17:44:27 +0000
(18:44 +0100)
cookbooks/squid/templates/default/squid.conf.erb
patch
|
blob
|
history
diff --git
a/cookbooks/squid/templates/default/squid.conf.erb
b/cookbooks/squid/templates/default/squid.conf.erb
index b92ed1ec357f4cd39ca93099d5123bcdb29668ad..89f8124836076e32855985567ad85614cef43f46 100644
(file)
--- a/
cookbooks/squid/templates/default/squid.conf.erb
+++ b/
cookbooks/squid/templates/default/squid.conf.erb
@@
-60,14
+60,18
@@
connect_timeout 20 seconds
client_lifetime 1 hours
collapsed_forwarding on
+<% if node[:squid][:version] == "2" -%>
refresh_stale_hit 300 seconds
+<% end -%>
#Recommended minimum configuration:
#----------------------------------
+<% if node[:squid][:version] == "2" -%>
acl all src all
acl manager proto cache_object
acl localhost src 127.0.0.1/32
acl to_localhost dst 127.0.0.0/8
+<% end -%>
acl SSL_ports port 443
acl Safe_ports port 80 # http
acl Safe_ports port 21 # ftp