From d186e21239bf87fbcb56399c4cd699349bfb9dd7 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 16 Aug 2021 13:49:13 +0200 Subject: [PATCH] evoadmin-web: simpler PHP packages lists --- CHANGELOG.md | 1 + webapps/evoadmin-web/tasks/packages.yml | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfe2a9f4..8e07c764 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The **patch** part changes incrementally at each release. * Remove embedded GPG keys only if legacy keyring is present * certbot: silence letsencrypt deprecation warnings * elasticsearch: 7.x by default +* evoadmin-web: simpler PHP packages lists * evocheck: upstream release 21.07 * evolinux-base: alert5 comes after the network * evolinux-base: force Debian version to buster for Evolix repository (temporary) diff --git a/webapps/evoadmin-web/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml index 7044bd43..e78f6c7b 100644 --- a/webapps/evoadmin-web/tasks/packages.yml +++ b/webapps/evoadmin-web/tasks/packages.yml @@ -4,32 +4,25 @@ name: evolix/apt tasks_from: evolix_public.yml -- name: Install PHP packages (Debian 10 and later) - apt: - name: php-pear - state: present - when: ansible_distribution_major_version is version('10', '>=') - # /!\ Warning, this is a temporary hack - include_role: name: evolix/remount-usr # /!\ Warning, this is a temporary hack -- name: Install PHP packages from sid (Debian 10 and later) +- name: Install PHP packages from sid (Debian 10) apt: deb: '{{ item }}' state: present loop: - 'http://mirror.evolix.org/debian/pool/main/p/php-log/php-log_1.12.9-2_all.deb' - when: ansible_distribution_major_version is version('10', '>=') + when: ansible_distribution_major_version is version('10', '=') -- name: Install PHP packages (stretch) +- name: Install PHP packages apt: name: - php-pear - php-log state: present - when: ansible_distribution_release == "stretch" - name: Install PHP5 packages (jessie) apt: