X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d30f9d83a0e72edddc844628245e56020582eb8b..256c5a8a9a19677c107860975991897b685bebe6:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 12c57c775..ce1edf966 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
@@ -119,6 +124,14 @@ log "squid-restart" do
   end
 end
 
+log "squid-restart-shm" do
+  message "Restarting squid due to remounted /dev/shm"
+  notifies :restart, "service[squid]"
+  not_if do
+    File.exist?("/dev/shm/squid-squid-page-pool.shm")
+  end
+end
+
 munin_plugin "squid_cache"
 munin_plugin "squid_times"
 munin_plugin "squid_icp"