Allow overwriting the fpm pools config name via 'filename'.

Signed-off-by: Rene Jochum <rene@jochums.at>
This commit is contained in:
Rene Jochum 2016-07-12 19:19:36 +02:00
parent 4a7e63f6ba
commit ce9ce324ce
2 changed files with 8 additions and 3 deletions

View File

@ -11,7 +11,7 @@
{% for pool, config in php.fpm.pools.iteritems() %} {% for pool, config in php.fpm.pools.iteritems() %}
{% set state = 'php_fpm_pool_conf_' ~ loop.index0 %} {% set state = 'php_fpm_pool_conf_' ~ loop.index0 %}
{% set fpath = path_join(pool, php.lookup.fpm.pools) %} {% set fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}
{{ state }}: {{ state }}:
{% if config.enabled %} {% if config.enabled %}

View File

@ -20,9 +20,9 @@ php:
pkgs: pkgs:
memcached: php5-memcached memcached: php5-memcached
# ensures both will be installed # ensures both will be installed
curl: curl:
- php-common - php-common
- curl - curl
# a dictionary can be used in more complex cases where you want # a dictionary can be used in more complex cases where you want
# to pass forward special arguments to the pkg.installed call # to pass forward special arguments to the pkg.installed call
# you MUST include the name argument for this to work # you MUST include the name argument for this to work
@ -99,6 +99,11 @@ php:
# If true, the pool file will be managed, if False it will be # If true, the pool file will be managed, if False it will be
# absent # absent
enabled: True enabled: True
# Overwrite the filename for ext_pillar that doesn't allow
# dots in fields names.
filname: my_other_name.conf
# arguments passed forward to file.managed or file.absent # arguments passed forward to file.managed or file.absent
opts: opts:
replace: False replace: False