D2478.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2478.id.diff
View Options

	diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
	--- a/pillar/webserver/sites.sls
	+++ b/pillar/webserver/sites.sls
	@@ -92,6 +92,8 @@
	source: wwwroot/dereckson.be/www
	target: /var/wwwroot/dereckson.be/www
	php-fpm: prod
	+ capabilities:
	+ - wordpress

	www51.dereckson.be:
	domain: dereckson.be
	diff --git a/roles/webserver-legacy/php-sites/files/php-fpm-pool.conf b/roles/webserver-legacy/php-sites/files/php-fpm-pool.conf
	--- a/roles/webserver-legacy/php-sites/files/php-fpm-pool.conf
	+++ b/roles/webserver-legacy/php-sites/files/php-fpm-pool.conf
	@@ -36,6 +36,11 @@
	php_flag[display_startup_errors] = {{ display_errors }}
	php_admin_flag[log_errors] = on

	+{% if 'wordpress' in capabilities -%}
	+; Allow Wordpress to process large images
	+php_value[memory_limit] = 1024M
	+{%- endif %}
	+
	; Don't flood /tmp (T417)
	php_value[session.save_path] = /var/tmp/php/sessions/{{ fqdn }}

	diff --git a/roles/webserver-legacy/php-sites/php-fpm.sls b/roles/webserver-legacy/php-sites/php-fpm.sls
	--- a/roles/webserver-legacy/php-sites/php-fpm.sls
	+++ b/roles/webserver-legacy/php-sites/php-fpm.sls
	@@ -45,6 +45,7 @@
	display_errors: {{ site['display_errors']\|default('off') }}
	slow_delay: {{ site['slow_delay']\|default('5s') }}
	env : {{ site['env']\|default({}) }}
	+ capabilities: {{ site['capabilities']\|default([]) }}

	/var/log/www/{{ site['domain' ]}}/{{ site['subdomain' ]}}-php.log:
	file.managed: