From 3ab19950c42ec157bbc44e6064786c048b6e11f7 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Thu, 25 Jun 2020 13:45:47 +0200 Subject: [PATCH] nginx/php-pool: Fixed memory_limit default to avoid overwrite by roles before --- roles/nginx/php-pool/defaults/main.yml | 2 +- roles/nginx/php-pool/templates/pool.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/php-pool/defaults/main.yml b/roles/nginx/php-pool/defaults/main.yml index 575bbdb..0099537 100644 --- a/roles/nginx/php-pool/defaults/main.yml +++ b/roles/nginx/php-pool/defaults/main.yml @@ -8,6 +8,6 @@ socket_directory: "{{ phpfpm_sockets_directory }}/{{ pool_name }}" socket: "{{ socket_directory }}/socket" includes: [] env_vars: {} -# memory_limit: 256M #optional +memory_limit: 0 # unlimited # status_page_path: "/status" # Disabled by default diff --git a/roles/nginx/php-pool/templates/pool.conf b/roles/nginx/php-pool/templates/pool.conf index c9ead3e..8bdbae4 100644 --- a/roles/nginx/php-pool/templates/pool.conf +++ b/roles/nginx/php-pool/templates/pool.conf @@ -35,6 +35,6 @@ env[{{ key }}] = {{ val | quote }} {% endfor %} php_admin_value[include_path] = ".:{{ includes | join(':') }}:/usr/share/php" -{% if memory_limit is defined %} +{% if memory_limit is defined and memory_limit %} php_admin_value[memory_limit] = {{ memory_limit }} {% endif %}