Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ini) support different settings for php.ini #210

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(ini) support different settings for php.ini #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion php/cli/ini.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,26 @@
{%- for version in pillar_php_version %}
{%- set first_version = pillar_php_version[0]|string %}
{%- set ini = php.lookup.cli.ini|replace(first_version, version) %}
{%- if version in php.cli.ini %}
{%- set settings_versioned = {} %}
{%- for key, value in settings.items() %}
{%- do settings_versioned.update({key: value.copy()}) %}
{%- endfor %}
{%- for key, value in php.cli.ini[version].items() %}
{%- if settings_versioned[key] is defined %}
{%- do settings_versioned[key].update(value) %}
{%- else %}
{%- do settings_versioned.update({key: value}) %}
{%- endif %}
{%- endfor %}
{%- endif %}
php_cli_ini_{{ version }}:
{{ php_ini(ini,
'php_cli_ini_' ~ version,
php.cli.ini.opts,
settings
settings_versioned | default(settings)
) }}
{%- endfor %}
{%- else %}
Expand Down
18 changes: 16 additions & 2 deletions php/fpm/config.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,33 @@
{%- set conf = php.lookup.fpm.conf|replace(first_version, version) %}
{%- set pools = php.lookup.fpm.pools|replace(first_version, version) %}

{%- if version in php.fpm.config.ini %}
{%- set ini_settings_versioned = {} %}
{%- for key, value in ini_settings.items() %}
{%- do ini_settings_versioned.update({key: value.copy()}) %}
{%- endfor %}
{%- for key, value in php.fpm.config.ini[version].items() %}
{%- if ini_settings_versioned[key] is defined %}
{%- do ini_settings_versioned[key].update(value) %}
{%- else %}
{%- do ini_settings_versioned.update({key: value}) %}
{%- endif %}
{%- endfor %}
{%- endif %}

{%- for key, value in conf_settings.items() %}
{%- if value is string %}
{%- do conf_settings.update({key: value.replace(first_version, version)}) %}
{%- endif %}
{%- endfor %}
{%- do conf_settings.global.update({'pid': '/var/run/php' + version + '-fpm.pid' }) %}
{%- do conf_settings.global.update({'pid': '/run/php/php' + version + '-fpm.pid' }) %}
{%- do conf_settings.global.update({'error_log': '/var/log/php' + version + '-fpm.log' }) %}

php_fpm_ini_config_{{ version }}:
{{ php_ini(ini,
'php_fpm_ini_config_' ~ version,
php.fpm.config.ini.opts,
ini_settings
ini_settings_versioned | default(ini_settings)
) }}

php_fpm_conf_config_{{ version }}:
Expand Down
10 changes: 10 additions & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ php:
engine: 'Off'
extension_dir: '/usr/lib/php/modules/'
extension: [pdo_mysql.so, iconv.so, openssl.so]
# if a list of versions is set in php:version, each version
# may have different settings
# '7.2':
# PHP:
# short_open_tag: 'On'

# options to manage the php-fpm conf file
conf:
Expand Down Expand Up @@ -169,6 +174,11 @@ php:
settings:
PHP:
engine: 'Off'
# if a list of versions is set in php:version, each version
# may have different settings
# '7.2':
# PHP:
# short_open_tag: 'On'

# php-xcache settings
xcache:
Expand Down