From c0ed2fa620601297380abd2cb5dc6aeff9b7e777 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 16 Aug 2019 10:11:23 +0200 Subject: [PATCH] php: variable to install the mysqlnd module instead of the default mysql module --- CHANGELOG.md | 1 + php/defaults/main.yml | 2 ++ php/tasks/main_jessie.yml | 2 +- php/tasks/main_stretch.yml | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e2eeef4..3cfe5909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release. ### Added * evolinux-base: On debian 10 and later, add noexec on /dev/shm +* php: variable to install the mysqlnd module instead of the default mysql module ### Changed * elasticsearch: listen on local interface only by default diff --git a/php/defaults/main.yml b/php/defaults/main.yml index d12014b2..52717e4b 100644 --- a/php/defaults/main.yml +++ b/php/defaults/main.yml @@ -4,3 +4,5 @@ php_sury_enable: False php_fpm_enable: False php_apache_enable: False php_symfony_requirements: False + +php_modules_mysqlnd: False diff --git a/php/tasks/main_jessie.yml b/php/tasks/main_jessie.yml index e8d8d85e..224f46a3 100644 --- a/php/tasks/main_jessie.yml +++ b/php/tasks/main_jessie.yml @@ -24,7 +24,7 @@ - php5-imap - php5-ldap - php5-mcrypt - - php5-mysql + - "{{ php_modules_mysqlnd | bool | ternary('php5-mysqlnd','php5-mysql') }}" - php5-pgsql - php-gettext - php5-intl diff --git a/php/tasks/main_stretch.yml b/php/tasks/main_stretch.yml index 4191519b..cc096af3 100644 --- a/php/tasks/main_stretch.yml +++ b/php/tasks/main_stretch.yml @@ -22,9 +22,9 @@ - php-intl - php-imap - php-ldap - - php-mysql - # php-mcrypt is no longer packaged for PHP 7.2 + - "{{ php_modules_mysqlnd | bool | ternary('php-mysqlnd','php-mysql') }}" - php-pgsql + # php-mcrypt is no longer packaged for PHP 7.2 - php-gettext - php-curl - php-ssh2