forked from evolix/ansible-roles
haproxy: support bookworm for backport packages
This commit is contained in:
parent
9a65312190
commit
f8e92d2eeb
|
@ -18,11 +18,12 @@ The **patch** part is incremented if multiple releases happen the same month
|
||||||
* autosysadmin-agent: upstream release 24.03.2
|
* autosysadmin-agent: upstream release 24.03.2
|
||||||
* evolinux-base: Add new variable to disable global customisation of bash config
|
* evolinux-base: Add new variable to disable global customisation of bash config
|
||||||
* evolinux-base: Disable logcheck monitoring of journald only if journald.logfiles exists
|
* 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
|
* 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
|
* nrpe: !disk1 exclude filesystem type overlay
|
||||||
* postfix/amavis: max servers is now 3 (previously 2)
|
* postfix/amavis: max servers is now 3 (previously 2)
|
||||||
|
* roundcube: Use /var/log/roundcube directly
|
||||||
|
* vrrpd : configure and restart minifirewall before starting VRRP
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
|
|
@ -35,5 +35,6 @@ haproxy_deny_ips: []
|
||||||
haproxy_backports_packages_stretch: haproxy libssl1.0.0
|
haproxy_backports_packages_stretch: haproxy libssl1.0.0
|
||||||
haproxy_backports_packages_buster: haproxy
|
haproxy_backports_packages_buster: haproxy
|
||||||
haproxy_backports_packages_bullseye: haproxy
|
haproxy_backports_packages_bullseye: haproxy
|
||||||
|
haproxy_backports_packages_bookworm: haproxy
|
||||||
|
|
||||||
haproxy_allow_ip_nonlocal_bind: Null
|
haproxy_allow_ip_nonlocal_bind: Null
|
|
@ -21,7 +21,6 @@
|
||||||
- name: Self-signed certificate is present in HAProxy ssl directory
|
- name: Self-signed certificate is present in HAProxy ssl directory
|
||||||
ansible.builtin.shell:
|
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"
|
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
|
creates: /etc/haproxy/ssl/ssl-cert-snakeoil.pem
|
||||||
notify: reload haproxy
|
notify: reload haproxy
|
||||||
tags:
|
tags:
|
||||||
|
|
|
@ -19,6 +19,10 @@
|
||||||
haproxy_backports_packages: "{{ haproxy_backports_packages_bullseye }}"
|
haproxy_backports_packages: "{{ haproxy_backports_packages_bullseye }}"
|
||||||
when: ansible_distribution_release == '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
|
- name: Prefer HAProxy package from backports
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: haproxy_apt_preferences.j2
|
src: haproxy_apt_preferences.j2
|
||||||
|
|
Loading…
Reference in a new issue