From db683ea9c33914b8d0b6f90bbcab44db986e31bb Mon Sep 17 00:00:00 2001 From: Tristan PILAT Date: Tue, 24 Jul 2018 15:43:45 +0200 Subject: [PATCH] Fix role - shift haproxy_apt_preferences file to the templates directory --- haproxy/files/haproxy_apt_preferences | 3 --- haproxy/tasks/packages_backports.yml | 4 ++-- haproxy/templates/haproxy_apt_preferences.j2 | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 haproxy/files/haproxy_apt_preferences create mode 100644 haproxy/templates/haproxy_apt_preferences.j2 diff --git a/haproxy/files/haproxy_apt_preferences b/haproxy/files/haproxy_apt_preferences deleted file mode 100644 index bae1e794..00000000 --- a/haproxy/files/haproxy_apt_preferences +++ /dev/null @@ -1,3 +0,0 @@ -Package: haproxy libssl1.0.0 -Pin: release a=jessie-backports -Pin-Priority: 999 diff --git a/haproxy/tasks/packages_backports.yml b/haproxy/tasks/packages_backports.yml index a5c33170..3be91268 100644 --- a/haproxy/tasks/packages_backports.yml +++ b/haproxy/tasks/packages_backports.yml @@ -8,8 +8,8 @@ - packages - name: Prefer HAProxy package from backports - copy: - src: haproxy_apt_preferences + template: + src: haproxy_apt_preferences.j2 dest: /etc/apt/preferences.d/999-haproxy force: yes mode: "0640" diff --git a/haproxy/templates/haproxy_apt_preferences.j2 b/haproxy/templates/haproxy_apt_preferences.j2 new file mode 100644 index 00000000..706ee67d --- /dev/null +++ b/haproxy/templates/haproxy_apt_preferences.j2 @@ -0,0 +1,3 @@ +Package: haproxy libssl1.0.0 +Pin: release a={{ ansible_distribution_release }}-backports +Pin-Priority: 999