From e5e4dc95fa32887350bfb7b2da5ab7c09053ac47 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 4 May 2021 14:57:18 +0200 Subject: [PATCH] packweb-apache: install phpMyAdmin from buster-backports --- CHANGELOG.md | 3 ++- packweb-apache/tasks/phpmyadmin.yml | 29 +++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e1e6c00..31f38bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,9 +21,10 @@ The **patch** part changes incrementally at each release. * Use 'loop' syntax instead of 'with_first_found/with_items/with_dict/with_nested/with_list' * apt: store keys in /etc/apt/trusted.gpg.d in ascii format +* certbot: sync_remote.sh is configurable * evolinux-base: copy GPG key instead of using apt-key * ntpd: Add leapfile configuration setting to ntpd on debian 10+ -* certbot: sync_remote.sh is configurable +* packweb-apache: install phpMyAdmin from buster-backports * spamassassin: change dependency on evomaintenance * squid: remove obsolete variable on Squid 4 diff --git a/packweb-apache/tasks/phpmyadmin.yml b/packweb-apache/tasks/phpmyadmin.yml index fc3e6d32..30c38aa7 100644 --- a/packweb-apache/tasks/phpmyadmin.yml +++ b/packweb-apache/tasks/phpmyadmin.yml @@ -4,20 +4,25 @@ apt: name: apg -- name: Install phpmyadmin (Debian <=9) +# On Debian 10, we need to install the package from buster-backports +- name: Enable backports (Debian 10) + include_role: + name: evolix/apt + tasks_from: backports.yml + when: ansible_distribution_major_version is version('10', '=') + +- name: Prefer phpMyAdmin package from backports (Debian 10) + template: + src: phpmyadmin_apt_preferences.j2 + dest: /etc/apt/preferences.d/999-phpmyadmin + force: yes + mode: "0640" + when: ansible_distribution_major_version is version('10', '=') + +- name: Install phpmyadmin apt: name: phpmyadmin - when: ansible_distribution_major_version is version('9', '<=') - -- include_role: - name: evolix/remount-usr - -# /!\ Warning: this is a temporary hack as phpmyadmin for Buster is not yet -# available -- name: Install phpmyadmin using sid package (Debian >=10) - apt: - deb: http://mirror.evolix.org/debian/pool/main/p/phpmyadmin/phpmyadmin_4.6.6-4_all.deb - when: ansible_distribution_major_version is version('10', '>=') + update_cache: yes - name: Check if phpmyadmin default configuration is present stat: