saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: merge ini changes with pillar data instead of overwriting

Browse Source
This commit is contained in:
Marius van Witzenburg 2021-09-10 15:12:49 +02:00
parent 1cbdc9595e
commit 2ba7c562f0
No known key found for this signature in database
GPG Key ID: 554DA2C4D1D47FC5
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
php/apache2/ini.sls
View File

@ -4,7 +4,27 @@
{%- from tplroot ~ "/ini.jinja" import php_ini %}
{%- set settings = php.ini.defaults %}
{%- do settings.update(php.apache2.ini.settings) %}
{%- for key, value in php.apache2.ini.settings.items() %}
{%- if settings[key] is defined %}
{%- do settings[key].update(value) %}
{%- else %}
{%- do settings.update({key: value}) %}
{%- endif %}
{%- endfor %}
{%- set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
{%- if pillar_php_version is iterable and pillar_php_version is not string %}
{%- for version in pillar_php_version %}
{%- set first_version = pillar_php_version[0]|string %}
{%- set ini = php.lookup.apache2.ini|replace(first_version, version) %}
php_apache2_ini_{{ version }}:
{{ php_ini(ini,
'php_apache2_ini_' ~ version,
php.apache2.ini.opts,
settings
) }}
{%- endfor %}
{%- else %}
php_apache2_ini:
{{ php_ini(php.lookup.apache2.ini,
@ -12,3 +32,4 @@ php_apache2_ini:
php.apache2.ini.opts,
settings
) }}
{%- endif %}