X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/de740c98fbdd4bc7a14c5b28cf09051045586ddc..2db5972d9f9604f3c3d7b8167fa3a740e6db7e03:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 89377089f..e665d57e3 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -24,41 +24,42 @@ template "/etc/squid/squid.conf" do
   source "squid.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 template "/etc/default/squid" do
   source "squid.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 if node[:lsb][:release].to_f >= 15.10
-  execute "systemctl-daemon-reload" do
-    action :nothing
-    command "systemctl daemon-reload"
-  end
-
-  template "/etc/systemd/system/squid.service" do
-    source "squid.service.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    notifies :run, "execute[systemctl-daemon-reload]"
+  systemd_service "squid" do
+    description "Squid caching proxy"
+    after ["network.target", "nss-lookup.target"]
+    limit_nofile 65536
+    environment "SQUID_ARGS" => "-D"
+    environment_file "/etc/default/squid"
+    exec_start_pre "/usr/sbin/squid $SQUID_ARGS -z"
+    exec_start "/usr/sbin/squid -N $SQUID_ARGS"
+    exec_reload "/usr/sbin/squid -k reconfigure"
+    exec_stop "/usr/sbin/squid -k shutdown"
+    restart "on-failure"
+    timeout_sec 0
   end
 
   service "squid" do
     provider Chef::Provider::Service::Systemd
     action [:enable, :start]
     supports :status => true, :restart => true, :reload => true
-    subscribes :restart, "template[/etc/systemd/system/squid.service]"
+    subscribes :restart, "systemd_service[squid]"
     subscribes :reload, "template[/etc/squid/squid.conf]"
     subscribes :restart, "template[/etc/default/squid]"
     subscribes :reload, "template[/etc/resolv.conf]"