From 38c8960ea8385b58b60492fc51da0e217d3275a8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 20 Sep 2016 09:08:17 +0100 Subject: [PATCH] Drop support for old Ubuntu versions from squid cookbook --- cookbooks/squid/recipes/default.rb | 51 +++++++++++------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb index d1b2f71f8..917834eb2 100644 --- a/cookbooks/squid/recipes/default.rb +++ b/cookbooks/squid/recipes/default.rb @@ -40,39 +40,26 @@ directory "/etc/squid/squid.conf.d" do mode 0o755 end -if node[:lsb][:release].to_f >= 15.10 - 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 +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, "systemd_service[squid]" - subscribes :reload, "template[/etc/squid/squid.conf]" - subscribes :restart, "template[/etc/default/squid]" - subscribes :reload, "template[/etc/resolv.conf]" - end -else - service "squid" do - provider Chef::Provider::Service::Upstart - action [:enable, :start] - supports :status => true, :restart => true, :reload => true - subscribes :reload, "template[/etc/squid/squid.conf]" - subscribes :restart, "template[/etc/default/squid]" - subscribes :reload, "template[/etc/resolv.conf]" - end +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 munin_plugin "squid_cache" -- 2.39.5