Disable php_fpm_ini_config
We prefer packaged defaults over formula ones. Undo this commit after a solution for https://github.com/saltstack-formulas/php-formula/pull/238#issuecomment-1445219305. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
23543ffa8b
commit
82fb667a88
@ -56,12 +56,16 @@ php_fpm_conf_config_{{ version }}:
|
|||||||
{%- set conf_settings = php.lookup.fpm.defaults %}
|
{%- set conf_settings = php.lookup.fpm.defaults %}
|
||||||
{%- do conf_settings.update(php.fpm.config.conf.settings) %}
|
{%- do conf_settings.update(php.fpm.config.conf.settings) %}
|
||||||
|
|
||||||
|
{#-
|
||||||
|
FIX-LIBERTACASA: prevent conflicts with packaged PHP INI configurations, to-do: solve in default map instead:
|
||||||
|
https://github.com/saltstack-formulas/php-formula/pull/238#issuecomment-1445219305
|
||||||
php_fpm_ini_config:
|
php_fpm_ini_config:
|
||||||
{{ php_ini(php.lookup.fpm.ini,
|
{{ php_ini(php.lookup.fpm.ini,
|
||||||
'php_fpm_ini_config',
|
'php_fpm_ini_config',
|
||||||
php.fpm.config.ini.opts,
|
php.fpm.config.ini.opts,
|
||||||
ini_settings
|
ini_settings
|
||||||
) }}
|
) }}
|
||||||
|
#}
|
||||||
|
|
||||||
php_fpm_conf_config:
|
php_fpm_conf_config:
|
||||||
{{ php_ini(php.lookup.fpm.conf,
|
{{ php_ini(php.lookup.fpm.conf,
|
||||||
|
@ -36,15 +36,15 @@ extend:
|
|||||||
php_fpm_service:
|
php_fpm_service:
|
||||||
service:
|
service:
|
||||||
- watch:
|
- watch:
|
||||||
- file: php_fpm_ini_config
|
# - file: php_fpm_ini_config
|
||||||
- file: php_fpm_conf_config
|
- file: php_fpm_conf_config
|
||||||
- require:
|
- require:
|
||||||
- sls: php.fpm.config
|
- sls: php.fpm.config
|
||||||
|
|
||||||
php_fpm_ini_config:
|
# php_fpm_ini_config:
|
||||||
file:
|
# file:
|
||||||
- require:
|
# - require:
|
||||||
- pkg: php_install_fpm
|
# - pkg: php_install_fpm
|
||||||
|
|
||||||
php_fpm_conf_config:
|
php_fpm_conf_config:
|
||||||
file:
|
file:
|
||||||
|
Loading…
Reference in New Issue
Block a user