From 04428ba015a0ef06a4cd6c2a671f99273f0cef91 Mon Sep 17 00:00:00 2001 From: TangRufus Date: Sat, 6 Mar 2021 21:22:50 +0000 Subject: [PATCH 1/2] Allow customizing PHP CLI `memory_limit` Close #1277 --- roles/php/defaults/main.yml | 1 + roles/php/templates/php-cli.ini.j2 | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/php/defaults/main.yml b/roles/php/defaults/main.yml index 8f68a7dc27..9f4baf5e39 100644 --- a/roles/php/defaults/main.yml +++ b/roles/php/defaults/main.yml @@ -11,6 +11,7 @@ php_max_execution_time: 120 php_max_input_time: 300 php_max_input_vars: 1000 php_memory_limit: 96M +php_cli_memory_limit: "{{ php_memory_limit }}" php_mysqlnd_collect_memory_statistics: 'Off' php_post_max_size: 25M php_sendmail_path: /usr/sbin/ssmtp -t diff --git a/roles/php/templates/php-cli.ini.j2 b/roles/php/templates/php-cli.ini.j2 index 389f042f57..44360aa80d 100644 --- a/roles/php/templates/php-cli.ini.j2 +++ b/roles/php/templates/php-cli.ini.j2 @@ -5,6 +5,7 @@ error_reporting = {{ php_error_reporting }} sendmail_path = {{ php_sendmail_path }} expose_php = Off date.timezone = {{ php_timezone }} +memory_limit = {{ php_cli_memory_limit }} [mysqlnd] mysqlnd.collect_memory_statistics = {{ php_mysqlnd_collect_memory_statistics }} From 8cfbbefbadd21adcf277149683394233ee1b8b46 Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Wed, 14 Jul 2021 11:02:08 -0400 Subject: [PATCH 2/2] Default PHP CLI memory limit to -1 --- CHANGELOG.md | 1 + roles/php/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ace92cae62..76b989aa54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Fix #1277 - Disable PHP CLI memory limit ([#1278](https://github.com/roots/trellis/pull/1278)) * Fix #1285 - Improve handling of WP-CLI failed verification ([#1295](https://github.com/roots/trellis/pull/1295)) * Fix #1284 - Update logrotate postrotate Nginx command ([#1293](https://github.com/roots/trellis/pull/1293)) * Replace php-gd with php-imagick ([#1292](https://github.com/roots/trellis/pull/1292)) diff --git a/roles/php/defaults/main.yml b/roles/php/defaults/main.yml index 9f4baf5e39..f157c97b98 100644 --- a/roles/php/defaults/main.yml +++ b/roles/php/defaults/main.yml @@ -11,7 +11,7 @@ php_max_execution_time: 120 php_max_input_time: 300 php_max_input_vars: 1000 php_memory_limit: 96M -php_cli_memory_limit: "{{ php_memory_limit }}" +php_cli_memory_limit: -1 php_mysqlnd_collect_memory_statistics: 'Off' php_post_max_size: 25M php_sendmail_path: /usr/sbin/ssmtp -t