From f8e92d2eebfed40375ff2dc2e39f9fb2876cdcac Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 18 Apr 2024 15:11:34 +0200 Subject: [PATCH] haproxy: support bookworm for backport packages --- CHANGELOG.md | 5 +++-- haproxy/defaults/main.yml | 3 ++- haproxy/tasks/main.yml | 1 - haproxy/tasks/packages_backports.yml | 4 ++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78d41498..a54666fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,11 +18,12 @@ The **patch** part is incremented if multiple releases happen the same month * autosysadmin-agent: upstream release 24.03.2 * evolinux-base: Add new variable to disable global customisation of bash config * evolinux-base: Disable logcheck monitoring of journald only if journald.logfiles exists -* roundcube: Use /var/log/roundcube directly * evolinux-users: Add sudo mvcli for nagios user -* vrrpd : configure and restart minifirewall before starting VRRP +* haproxy: support bookworm for backport packages * nrpe: !disk1 exclude filesystem type overlay * postfix/amavis: max servers is now 3 (previously 2) +* roundcube: Use /var/log/roundcube directly +* vrrpd : configure and restart minifirewall before starting VRRP ### Fixed diff --git a/haproxy/defaults/main.yml b/haproxy/defaults/main.yml index 50f6bb48..f0c1652e 100644 --- a/haproxy/defaults/main.yml +++ b/haproxy/defaults/main.yml @@ -35,5 +35,6 @@ haproxy_deny_ips: [] haproxy_backports_packages_stretch: haproxy libssl1.0.0 haproxy_backports_packages_buster: haproxy haproxy_backports_packages_bullseye: haproxy +haproxy_backports_packages_bookworm: haproxy -haproxy_allow_ip_nonlocal_bind: Null \ No newline at end of file +haproxy_allow_ip_nonlocal_bind: Null diff --git a/haproxy/tasks/main.yml b/haproxy/tasks/main.yml index 12fdd224..c8c38f05 100644 --- a/haproxy/tasks/main.yml +++ b/haproxy/tasks/main.yml @@ -21,7 +21,6 @@ - name: Self-signed certificate is present in HAProxy ssl directory ansible.builtin.shell: cmd: "cat /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/ssl/private/ssl-cert-snakeoil.key > /etc/haproxy/ssl/ssl-cert-snakeoil.pem" - args: creates: /etc/haproxy/ssl/ssl-cert-snakeoil.pem notify: reload haproxy tags: diff --git a/haproxy/tasks/packages_backports.yml b/haproxy/tasks/packages_backports.yml index 2a5a855c..6ad4e325 100644 --- a/haproxy/tasks/packages_backports.yml +++ b/haproxy/tasks/packages_backports.yml @@ -19,6 +19,10 @@ haproxy_backports_packages: "{{ haproxy_backports_packages_bullseye }}" when: ansible_distribution_release == 'bullseye' +- ansible.builtin.set_fact: + haproxy_backports_packages: "{{ haproxy_backports_packages_bookworm }}" + when: ansible_distribution_release == 'bookworm' + - name: Prefer HAProxy package from backports ansible.builtin.template: src: haproxy_apt_preferences.j2