From 4a9050b1ae05d5d3a580e230cec6b5be9a9f8bb9 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 2 Feb 2022 12:38:54 -0600 Subject: [PATCH] Issue #357: Two versions of PHP are getting installed. --- vars/Debian-10.yml | 15 +++++++++++++++ vars/Debian-11.yml | 15 +++++++++++++++ vars/Debian-9.yml | 15 +++++++++++++++ vars/Debian.yml | 15 --------------- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/vars/Debian-10.yml b/vars/Debian-10.yml index ec895ae..c7ce556 100644 --- a/vars/Debian-10.yml +++ b/vars/Debian-10.yml @@ -1,2 +1,17 @@ --- __php_default_version_debian: "7.3" +__php_packages: + - php{{ php_default_version_debian }}-common + - php{{ php_default_version_debian }}-cli + - php{{ php_default_version_debian }}-dev + - php{{ php_default_version_debian }}-fpm + - libpcre3-dev + - php{{ php_default_version_debian }}-gd + - php{{ php_default_version_debian }}-curl + - php{{ php_default_version_debian }}-imap + - php{{ php_default_version_debian }}-json + - php{{ php_default_version_debian }}-opcache + - php{{ php_default_version_debian }}-xml + - php{{ php_default_version_debian }}-mbstring + - php{{ php_default_version_debian }}-apcu + - php-sqlite3 diff --git a/vars/Debian-11.yml b/vars/Debian-11.yml index a16b99b..7497010 100644 --- a/vars/Debian-11.yml +++ b/vars/Debian-11.yml @@ -1,2 +1,17 @@ --- __php_default_version_debian: "7.4" +__php_packages: + - php{{ php_default_version_debian }}-common + - php{{ php_default_version_debian }}-cli + - php{{ php_default_version_debian }}-dev + - php{{ php_default_version_debian }}-fpm + - libpcre3-dev + - php{{ php_default_version_debian }}-gd + - php{{ php_default_version_debian }}-curl + - php{{ php_default_version_debian }}-imap + - php{{ php_default_version_debian }}-json + - php{{ php_default_version_debian }}-opcache + - php{{ php_default_version_debian }}-xml + - php{{ php_default_version_debian }}-mbstring + - php{{ php_default_version_debian }}-apcu + - php-sqlite3 diff --git a/vars/Debian-9.yml b/vars/Debian-9.yml index eb23ce3..dc7ed13 100644 --- a/vars/Debian-9.yml +++ b/vars/Debian-9.yml @@ -1,2 +1,17 @@ --- __php_default_version_debian: "7.0" +__php_packages: + - php{{ php_default_version_debian }}-common + - php{{ php_default_version_debian }}-cli + - php{{ php_default_version_debian }}-dev + - php{{ php_default_version_debian }}-fpm + - libpcre3-dev + - php{{ php_default_version_debian }}-gd + - php{{ php_default_version_debian }}-curl + - php{{ php_default_version_debian }}-imap + - php{{ php_default_version_debian }}-json + - php{{ php_default_version_debian }}-opcache + - php{{ php_default_version_debian }}-xml + - php{{ php_default_version_debian }}-mbstring + - php-sqlite3 + - php-apcu diff --git a/vars/Debian.yml b/vars/Debian.yml index c487fd8..2a0ffa1 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,21 +1,6 @@ --- __php_default_version_debian: "7.0" -__php_packages: - - php{{ php_default_version_debian }}-common - - php{{ php_default_version_debian }}-cli - - php{{ php_default_version_debian }}-dev - - php{{ php_default_version_debian }}-fpm - - libpcre3-dev - - php{{ php_default_version_debian }}-gd - - php{{ php_default_version_debian }}-curl - - php{{ php_default_version_debian }}-imap - - php{{ php_default_version_debian }}-json - - php{{ php_default_version_debian }}-opcache - - php{{ php_default_version_debian }}-xml - - php{{ php_default_version_debian }}-mbstring - - php-sqlite3 - - php-apcu __php_webserver_daemon: "apache2" # Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode.