evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 19 Releases 33 Wiki Activity

Revert "squid: consistent version switch" because we use == jessie everywhere

Browse source 
This reverts commit c44896d433.
This commit is contained in:
Gregory Colpart 2017-09-14 19:13:59 +02:00
parent 76dda62001
commit 3882a366e4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
squid/tasks/main.yml
View file

@ -5,10 +5,10 @@
when: when:
- ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<')
- name: "Set squid name (Debian 8)" - name: "Set squid name (jessie)"
set_fact: set_fact:
squid_daemon_name: squid3 squid_daemon_name: squid3
when: ansible_distribution_major_version == "8" when: ansible_distribution_release == "jessie"
- name: "Set squid name (Debian 9 or later)" - name: "Set squid name (Debian 9 or later)"
set_fact: set_fact:
@ -29,20 +29,20 @@
dest: /etc/default/squid dest: /etc/default/squid
when: ansible_distribution_major_version | version_compare('9', '>=') when: ansible_distribution_major_version | version_compare('9', '>=')
- name: "squid.conf is present (Debian 8)" - name: "squid.conf is present (jessie)"
template: template:
src: squid.conf.j2 src: squid.conf.j2
dest: /etc/squid3/squid.conf dest: /etc/squid3/squid.conf
notify: "restart squid3" notify: "restart squid3"
when: ansible_distribution_major_version == "8" when: ansible_distribution_release == "jessie"
- name: "evolix whitelist is present (Debian 8)" - name: "evolix whitelist is present (jessie)"
copy: copy:
src: whitelist-evolinux.conf src: whitelist-evolinux.conf
dest: /etc/squid3/whitelist.conf dest: /etc/squid3/whitelist.conf
force: no force: no
notify: "reload squid3" notify: "reload squid3"
when: ansible_distribution_major_version == "8" when: ansible_distribution_release == "jessie"
- name: "evolinux custom squid file (Debian 9 or later)" - name: "evolinux custom squid file (Debian 9 or later)"
copy: copy: