nginx/php-pool: Allow configuring arbitary php_admin_values

- removing support for explicit configuration key for memory_limit
- replaced usage of memory_limit key with usage of admin_values key
master
Felix Stupp 4 years ago
parent 98b7b55a53
commit f2dac5ca1f
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -9,6 +9,13 @@ socket: "{{ socket_directory }}/socket"
allow_overwrite_includes: no
includes: []
env_vars: {}
memory_limit: 0 # unlimited
admin_values: {}
# status_page_path: "/status" # Disabled by default
default_admin_values:
memory_limit: None # unlimited
enforced_admin_values: {}
effective_admin_values: "{{ default_admin_values | combine(admin_values) | combine(enforced_admin_values) }}"

@ -37,6 +37,6 @@ env[{{ key }}] = {{ val | quote }}
{% 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 %}
{% for key, value in admin_values.items() %}{% if value != None %}
php_admin_value[{{ key }}] = {{ value | quote }}
{% endif %}{% endfor %}

@ -20,7 +20,8 @@ dependencies:
src: "{{ nextcloud_installation_directory }}"
includes:
- "{{ nextcloud_installation_directory }}/apps"
memory_limit: 1G
admin_values:
memory_limit: 1G
- role: redis/instance
# domain
# system_user

Loading…
Cancel
Save