From c44896d4335e807f828bf66b4e67f195242beddd Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 14 Sep 2017 09:19:00 +0200 Subject: [PATCH] squid: consistent version switch --- squid/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml index 9a6e0469..0557b6b5 100644 --- a/squid/tasks/main.yml +++ b/squid/tasks/main.yml @@ -5,10 +5,10 @@ when: - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') -- name: "Set squid name (jessie)" +- name: "Set squid name (Debian 8)" set_fact: squid_daemon_name: squid3 - when: ansible_distribution_release == "jessie" + when: ansible_distribution_major_version == "8" - name: "Set squid name (Debian 9 or later)" set_fact: @@ -29,19 +29,19 @@ dest: /etc/default/squid when: ansible_distribution_major_version | version_compare('9', '>=') -- name: "squid.conf is present (jessie)" +- name: "squid.conf is present (Debian 8)" template: src: squid.conf.j2 dest: /etc/squid3/squid.conf notify: "restart squid3" - when: ansible_distribution_release == "jessie" + when: ansible_distribution_major_version == "8" -- name: "evolix whitelist is present (jessie)" +- name: "evolix whitelist is present (Debian 8)" copy: src: whitelist-evolinux.conf dest: /etc/squid3/whitelist.conf notify: "reload squid3" - when: ansible_distribution_release == "jessie" + when: ansible_distribution_major_version == "8" - name: "evolinux custom squid file (Debian 9 or later)" copy: