From 7f54b8ab604f515bd640966b1d51d27df4968679 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sun, 14 Jun 2020 12:35:44 +0200
Subject: [PATCH] haproxy: adapt backports installed package list to
 distibution

---
 CHANGELOG.md                                 |  1 +
 haproxy/defaults/main.yml                    |  3 +++
 haproxy/tasks/packages_backports.yml         | 20 ++++++++++++++------
 haproxy/templates/haproxy_apt_preferences.j2 |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5574db4..ae6a2d2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ The **patch** part changes incrementally at each release.
 * lxc-php: Do --no-install-recommends for ssmtp/opensmtpd
 * packweb-apache: Don't turn on mod-evasive emails by default
 * haproxy: chroot and socket path are configurable
+* haproxy: adapt backports installed package list to distibution
 * redis: create sudoers file if missing
 * redis: new syntax for match filter
 * redis: raise an error is port 6379 is used in "instance" mode
diff --git a/haproxy/defaults/main.yml b/haproxy/defaults/main.yml
index 6096567a..64d061ef 100644
--- a/haproxy/defaults/main.yml
+++ b/haproxy/defaults/main.yml
@@ -14,3 +14,6 @@ haproxy_maintenance_ips: []
 
 haproxy_stats_enable: False
 haproxy_stats_bind: "*:8080 ssl crt /etc/haproxy/ssl/"
+
+haproxy_backports_packages_stretch: haproxy libssl1.0.0
+haproxy_backports_packages_buster: haproxy
diff --git a/haproxy/tasks/packages_backports.yml b/haproxy/tasks/packages_backports.yml
index 66c2118e..9a682120 100644
--- a/haproxy/tasks/packages_backports.yml
+++ b/haproxy/tasks/packages_backports.yml
@@ -4,8 +4,16 @@
     name: evolix/apt
     tasks_from: backports.yml
   tags:
-  - haproxy
-  - packages
+    - haproxy
+    - packages
+
+- set_fact:
+    haproxy_backports_packages: "{{ haproxy_backports_packages_stretch }}"
+  when: ansible_distribution_release == 'stretch'
+
+- set_fact:
+    haproxy_backports_packages: "{{ haproxy_backports_packages_buster }}"
+  when: ansible_distribution_release == 'buster'
 
 - name: Prefer HAProxy package from backports
   template:
@@ -15,13 +23,13 @@
     mode: "0640"
   register: haproxy_apt_preferences
   tags:
-  - haproxy
-  - packages
+    - haproxy
+    - packages
 
 - name: update apt
   apt:
     update_cache: yes
   when: haproxy_apt_preferences is changed
   tags:
-  - haproxy
-  - packages
+    - haproxy
+    - packages
diff --git a/haproxy/templates/haproxy_apt_preferences.j2 b/haproxy/templates/haproxy_apt_preferences.j2
index 706ee67d..243e3e86 100644
--- a/haproxy/templates/haproxy_apt_preferences.j2
+++ b/haproxy/templates/haproxy_apt_preferences.j2
@@ -1,3 +1,3 @@
-Package: haproxy libssl1.0.0
+Package: {{ haproxy_backports_packages }}
 Pin: release a={{ ansible_distribution_release }}-backports
 Pin-Priority: 999