From 9dd0afa884acf2b58639d351f3ee9c03a4d17cb2 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 1 Mar 2017 15:03:08 +0100 Subject: [PATCH] isti-puma: Add PHP variables needed by joomla. library/roles/php-fpm: Fix typos in an example. Add some global settings to the pool template. --- php-fpm/defaults/main.yml | 4 ++-- php-fpm/templates/php-fpm-pool.conf.j2 | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/php-fpm/defaults/main.yml b/php-fpm/defaults/main.yml index f5c40dde..c9305ed1 100644 --- a/php-fpm/defaults/main.yml +++ b/php-fpm/defaults/main.yml @@ -18,9 +18,9 @@ php_fpm_packages: - 'php{{ php_version }}-fpm' #php_global_settings: -# - { option='', value='', state='' } +# - { option: '', value: '', state: '' } #php_cli_global_settings: -# - { option='', value='', state='' } +# - { option: '', value: '', state: '' } # Main confign file settings # It can be 'syslog' diff --git a/php-fpm/templates/php-fpm-pool.conf.j2 b/php-fpm/templates/php-fpm-pool.conf.j2 index 00e8a7ab..05da099f 100644 --- a/php-fpm/templates/php-fpm-pool.conf.j2 +++ b/php-fpm/templates/php-fpm-pool.conf.j2 @@ -276,7 +276,9 @@ php_flag[display_errors] = {{ item.display_errors | default('off') }} php_admin_value[error_log] = {{ phpfpm_logdir }}/$pool-error.log php_admin_flag[log_errors] = {{ item.log_errors | default('on') }} php_admin_value[memory_limit] = {{ item.memory_limit | default('64M') }} -php_admin_value[upload_max_filesize] = {{ item.upload_max_filesize | default('100M') }} +php_admin_value[upload_max_filesize] = {{ item.upload_max_filesize | default('20M') }} +php_admin_value[post_max_size] = {{ item.upload_max_filesize | default('20M') }} +php_admin_value[upload_tmp_dir] = {{ item.upload_tmp_dir | default('/var/tmp') }} ; Set session path to a directory owned by process user php_value[session.save_handler] = '{{ item.session_save_handler | default('files') }}' {% if phpfpm_session_prefix is defined %}