X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d30f9d83a0e72edddc844628245e56020582eb8b..662bd409683d121182a87f8c26a0b77d66e385f1:/cookbooks/squid/recipes/default.rb diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb index 12c57c775..c2bd5b834 100644 --- a/cookbooks/squid/recipes/default.rb +++ b/cookbooks/squid/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: squid +# Cookbook:: squid # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ # limitations under the License. # -if node[:squid][:version] == "3" +if node[:squid][:version] >= 3 apt_package "squid" do action :unlock end @@ -85,6 +85,10 @@ systemd_tmpfile "/var/run/squid" do mode "0755" end +address_families = %w[AF_UNIX AF_INET] + +# address_families << "AF_INET6" unless node.interfaces(:family => :inet6).empty? + systemd_service "squid" do description "Squid caching proxy" after ["network.target", "nss-lookup.target"] @@ -98,6 +102,7 @@ systemd_service "squid" do private_devices true protect_system "full" protect_home true + restrict_address_families address_families restart "on-failure" timeout_sec 0 end