@@ -11,5 +11,16 @@ | |||
{% endif %} | |||
{% endfor %} | |||
{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %} | |||
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %} | |||
{% for version in pillar_php_ng_version %} | |||
{% set first_version = pillar_php_ng_version[0]|string %} | |||
{% set ini = php.lookup.cli.ini|replace(first_version, version) %} | |||
php_cli_ini_{{ version }}: | |||
{{ php_ini(ini, php.cli.ini.opts, settings) }} | |||
{% endfor %} | |||
{% else %} | |||
php_cli_ini: | |||
{{ php_ini(php.lookup.cli.ini, php.cli.ini.opts, settings) }} | |||
{% endif %} |
@@ -4,8 +4,19 @@ include: | |||
- php.ng.cli.install | |||
- php.ng.cli.ini | |||
{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %} | |||
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %} | |||
extend: | |||
{% for version in pillar_php_ng_version %} | |||
php_cli_ini_{{ version }}: | |||
file: | |||
- require: | |||
- sls: php.ng.cli.install | |||
{% endfor %} | |||
{% else %} | |||
extend: | |||
php_cli_ini: | |||
file: | |||
- require: | |||
- sls: php.ng.cli.install | |||
{% endif %} |
@@ -3,8 +3,18 @@ | |||
{%- if salt['grains.get']('os_family') == "Debian" %} | |||
{% set current_php = salt['alternatives.show_current']('php') %} | |||
{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %} | |||
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %} | |||
{% if 'alternatives_version' in salt['pillar.get']('php:ng') %} | |||
{% set phpng_version = salt['pillar.get']('php:ng:alternatives_version') %} | |||
{% else %} | |||
{% set phpng_version = false %} | |||
{% endif %} | |||
{% else %} | |||
{% set phpng_version = salt['pillar.get']('php:ng:version', '7.0')|string %} | |||
{% endif %} | |||
{% if phpng_version %} | |||
php_{{ phpng_version }}_link: | |||
alternatives.set: | |||
- name: php | |||
@@ -15,3 +25,4 @@ php_{{ phpng_version }}_link: | |||
- which php | |||
- test {{ current_php }} != $(which php{{ phpng_version }}) | |||
{% endif %} | |||
{% endif %} |