Browse Source

Add possibility to define default values for php-fpm pools

tags/v0.34.0
Mario Fritschen 7 years ago
parent
commit
75bbecaf28
2 changed files with 12 additions and 0 deletions
  1. +6
    -0
      php/ng/fpm/pools_config.sls
  2. +6
    -0
      pillar.example

+ 6
- 0
php/ng/fpm/pools_config.sls View File

@@ -10,6 +10,12 @@
{% set pool_states = [] %}

{% for pool, config in php.fpm.pools.iteritems() %}
{% if pool == 'defaults' %}{% continue %}{% endif %}
{% for pkey, pvalues in config.get('settings', {}).iteritems() %}
{% set pool_defaults = php.fpm.pools.get('defaults', {}).copy() %}
{% do pool_defaults.update(pvalues) %}
{% do pvalues.update(pool_defaults) %}
{% endfor %}
{% set state = 'php_fpm_pool_conf_' ~ loop.index0 %}
{% set fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}


+ 6
- 0
pillar.example View File

@@ -93,6 +93,12 @@ php:

# settings for fpm-pools
pools:
# defaults will apply for each pools settings and can be overwritten by pool settings
defaults:
user: nginx
group: nginx
listen: /var/run/php-fpm-default.sock

# name of the pool file to be managed, this will be appended
# to the path specified in php.ng.lookup.fpm.pools
'mypool.conf':

Loading…
Cancel
Save