From 7638b6f86cd441fef543dc129377eb894d3fd531 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Thu, 25 Jun 2020 13:46:35 +0200 Subject: [PATCH] nginx/php-pool: Added configuration for allow_overwrite_include --- roles/nginx/php-pool/defaults/main.yml | 1 + roles/nginx/php-pool/templates/pool.conf | 2 ++ 2 files changed, 3 insertions(+) diff --git a/roles/nginx/php-pool/defaults/main.yml b/roles/nginx/php-pool/defaults/main.yml index 0099537..557149e 100644 --- a/roles/nginx/php-pool/defaults/main.yml +++ b/roles/nginx/php-pool/defaults/main.yml @@ -6,6 +6,7 @@ pool_name: "{{ system_user + '-' + domain | regex_findall('[a-zA-Z0-9]+') | join('_') }}" socket_directory: "{{ phpfpm_sockets_directory }}/{{ pool_name }}" socket: "{{ socket_directory }}/socket" +allow_overwrite_includes: no includes: [] env_vars: {} memory_limit: 0 # unlimited diff --git a/roles/nginx/php-pool/templates/pool.conf b/roles/nginx/php-pool/templates/pool.conf index 8bdbae4..c31e0cd 100644 --- a/roles/nginx/php-pool/templates/pool.conf +++ b/roles/nginx/php-pool/templates/pool.conf @@ -34,7 +34,9 @@ env[TEMP] = /tmp env[{{ key }}] = {{ val | quote }} {% endfor %} +{% if not allow_overwrite_includes %} php_admin_value[include_path] = ".:{{ includes | join(':') }}:/usr/share/php" +{% endif %} {% if memory_limit is defined and memory_limit %} php_admin_value[memory_limit] = {{ memory_limit }} {% endif %}