diff --git a/php/fpm/config.sls b/php/fpm/config.sls index e7574ea..560abd6 100644 --- a/php/fpm/config.sls +++ b/php/fpm/config.sls @@ -56,12 +56,16 @@ php_fpm_conf_config_{{ version }}: {%- set conf_settings = php.lookup.fpm.defaults %} {%- 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_ini(php.lookup.fpm.ini, 'php_fpm_ini_config', php.fpm.config.ini.opts, ini_settings ) }} +#} php_fpm_conf_config: {{ php_ini(php.lookup.fpm.conf, diff --git a/php/fpm/init.sls b/php/fpm/init.sls index 85b38fa..4fd30eb 100644 --- a/php/fpm/init.sls +++ b/php/fpm/init.sls @@ -36,15 +36,15 @@ extend: php_fpm_service: service: - watch: - - file: php_fpm_ini_config +# - file: php_fpm_ini_config - file: php_fpm_conf_config - require: - sls: php.fpm.config - php_fpm_ini_config: - file: - - require: - - pkg: php_install_fpm +# php_fpm_ini_config: +# file: +# - require: +# - pkg: php_install_fpm php_fpm_conf_config: file: