diff --git a/CHANGELOG.md b/CHANGELOG.md index 9364cc4b..be32015f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ The **patch** part changes incrementally at each release. * listupgrade: upstream release 21.06.3 * mysql: mariadb-client-10.5 on Debian 11 * mysql: use python3 with Debian 11 and later +* ntpd: Add leapfile configuration setting to ntpd on debian 10+ +* squid: remove obsolete variable on Squid 4 ### Fixed diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml index 9e00dcb0..4a3cab4d 100644 --- a/squid/tasks/main.yml +++ b/squid/tasks/main.yml @@ -22,6 +22,13 @@ - squidclient state: present +- name: Fetch packages + package_facts: + manager: auto + +- debug: + var: ansible_facts.packages[squid_daemon_name] + - name: "Set alternative config file (Debian 9 or later)" copy: src: default_squid diff --git a/squid/templates/evolinux-custom.conf.j2 b/squid/templates/evolinux-custom.conf.j2 index cc465dc7..27c97cc2 100644 --- a/squid/templates/evolinux-custom.conf.j2 +++ b/squid/templates/evolinux-custom.conf.j2 @@ -1,4 +1,4 @@ http_port 8888 transparent cache deny all -ignore_expect_100 on +{% if ansible_facts.packages[squid_daemon_name][0]['version'] is version (4, '<') %}ignore_expect_100 on{% endif %} tcp_outgoing_address {{ squid_address }}