diff --git a/CHANGELOG.md b/CHANGELOG.md index a7b7d2b7..185efb49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The **patch** part changes incrementally at each release. ### Changed * elasticsearch: listen on local interface only by default +* squid: split systemd tasks into own file ### Fixed * lxc-php: Don't remove the default pool diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml index f04a08f0..31f03229 100644 --- a/squid/tasks/main.yml +++ b/squid/tasks/main.yml @@ -29,12 +29,6 @@ dest: /etc/default/squid when: ansible_distribution_major_version | version_compare('9', '>=') -- name: "Set custom systemd unit service (Debian 10 or later)" - copy: - src: squid.service - dest: /etc/systemd/system/squid.service - when: ansible_distribution_major_version | version_compare('10', '>=') - - name: "squid.conf is present (jessie)" template: src: squid.conf.j2 @@ -140,11 +134,7 @@ notify: "reload squid" when: ansible_distribution_major_version | version_compare('9', '>=') -- name: "Reload systemd and restart squid (Debian 10 or later)" - systemd: - name: squid - state: restarted - daemon_reload: yes +- include: systemd.yml when: ansible_distribution_major_version | version_compare('10', '>=') - include: logrotate_jessie.yml diff --git a/squid/tasks/systemd.yml b/squid/tasks/systemd.yml new file mode 100644 index 00000000..d4862477 --- /dev/null +++ b/squid/tasks/systemd.yml @@ -0,0 +1,14 @@ +--- + +- name: "Set custom systemd unit service (Debian 10 or later)" + copy: + src: squid.service + dest: /etc/systemd/system/squid.service + when: ansible_distribution_major_version | version_compare('10', '>=') + +- name: "Reload systemd and restart squid (Debian 10 or later)" + systemd: + name: squid + state: restarted + daemon_reload: yes + when: ansible_distribution_major_version | version_compare('10', '>=')