From a623f414ba8b94c441734755cc15262cfc524153 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 24 Jun 2019 12:22:18 +0200 Subject: [PATCH] Additional cleanup of the php-related variables. --- library/roles/nextcloud/vars/main.yml | 5 +---- library/roles/php-fpm/defaults/main.yml | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/library/roles/nextcloud/vars/main.yml b/library/roles/nextcloud/vars/main.yml index 3e98d2ee..f131d0f7 100644 --- a/library/roles/nextcloud/vars/main.yml +++ b/library/roles/nextcloud/vars/main.yml @@ -7,11 +7,8 @@ http_port: 80 https_port: 443 php_version: 7.2 -phpfpm_base_dir: '/etc/php/{{ php_version }}/fpm' -phpfpm_cli_dir: '/etc/php/{{ php_version }}/cli' -php_fpm_packages: - - 'php{{ php_version }}-fpm' +php_additional_packages: - 'php{{ php_version }}-gd' - 'php{{ php_version }}-json' - 'php{{ php_version }}-ldap' diff --git a/library/roles/php-fpm/defaults/main.yml b/library/roles/php-fpm/defaults/main.yml index 02ca0777..44896d22 100644 --- a/library/roles/php-fpm/defaults/main.yml +++ b/library/roles/php-fpm/defaults/main.yml @@ -9,13 +9,13 @@ php_from_ppa: False php_ppa: ppa:ondrej/php php_version: 7.2 -phpfpm_base_dir: '/etc/php{{ php_version }}/fpm' -phpfpm_cli_dir: '/etc/php{{ php_version }}/cli' -# Change to when using the PPA -# phpfpm_base_dir: '/etc/php/{{ php_version }}/fpm' +phpfpm_root_dir: '/etc/php/{{ php_version }}' +phpfpm_base_dir: '{{ phpfpm_root_dir }}/fpm' +phpfpm_cli_dir: '{{ phpfpm_root_dir }}/cli' php_fpm_packages: - 'php{{ php_version }}-fpm' + - 'php{{ php_version }}-cli' #php_global_settings: # - { option: '', value: '', state: '' }