Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow customizing PHP CLI memory_limit #1278

Merged
merged 2 commits into from
Jul 14, 2021
Merged

Allow customizing PHP CLI memory_limit #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04428ba
Allow customizing PHP CLI `memory_limit`
tangrufus Mar 6, 2021
8cfbbef
Default PHP CLI memory limit to -1
swalkinshaw Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
1 change: 1 addition & 0 deletions roles/php/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: -1
php_mysqlnd_collect_memory_statistics: 'Off'
php_post_max_size: 25M
php_sendmail_path: /usr/sbin/ssmtp -t
Expand Down
1 change: 1 addition & 0 deletions roles/php/templates/php-cli.ini.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down