File tree Expand file tree Collapse file tree 3 files changed +33
-0
lines changed Expand file tree Collapse file tree 3 files changed +33
-0
lines changed Original file line number Diff line number Diff line change 11
11
{% endif % }
12
12
{% endfor % }
13
13
14
+ {% set pillar_php_ng_version = salt[' pillar.get' ](' php:ng:version' , ' 7.0' ) % }
15
+ {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string % }
16
+ {% for version in pillar_php_ng_version % }
17
+ {% set first_version = pillar_php_ng_version[0 ]| string % }
18
+ {% set ini = php.lookup.cli.ini| replace(first_version, version) % }
19
+ php_cli_ini_{{ version }}:
20
+ {{ php_ini(ini, php.cli.ini.opts, settings) }}
21
+ {% endfor % }
22
+ {% else % }
23
+
14
24
php_cli_ini:
15
25
{{ php_ini(php.lookup.cli.ini, php.cli.ini.opts, settings) }}
26
+ {% endif % }
Original file line number Diff line number Diff line change @@ -4,8 +4,19 @@ include:
4
4
- php.ng.cli.install
5
5
- php.ng.cli.ini
6
6
7
+ {% set pillar_php_ng_version = salt[' pillar.get' ](' php:ng:version' , ' 7.0' ) %}
8
+ {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
9
+ extend:
10
+ {% for version in pillar_php_ng_version %}
11
+ php_cli_ini_{{ version }} :
12
+ file:
13
+ - require:
14
+ - sls: php.ng.cli.install
15
+ {% endfor %}
16
+ {% else %}
7
17
extend:
8
18
php_cli_ini:
9
19
file:
10
20
- require:
11
21
- sls: php.ng.cli.install
22
+ {% endif %}
Original file line number Diff line number Diff line change 3
3
4
4
{%- if salt[' grains.get' ](' os_family' ) == " Debian" %}
5
5
{% set current_php = salt[' alternatives.show_current' ](' php' ) %}
6
+ {% set pillar_php_ng_version = salt[' pillar.get' ](' php:ng:version' , ' 7.0' ) %}
7
+ {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
8
+ {% if ' alternatives_version' in salt[' pillar.get' ](' php:ng' ) %}
9
+ {% set phpng_version = salt[' pillar.get' ](' php:ng:alternatives_version' ) %}
10
+ {% else %}
11
+ {% set phpng_version = false %}
12
+ {% endif %}
13
+ {% else %}
6
14
{% set phpng_version = salt[' pillar.get' ](' php:ng:version' , ' 7.0' )| string %}
15
+ {% endif %}
7
16
17
+ {% if phpng_version %}
8
18
php_{{ phpng_version }}_link :
9
19
alternatives.set :
10
20
- name: php
@@ -15,3 +25,4 @@ php_{{ phpng_version }}_link:
15
25
- which php
16
26
- test {{ current_php }} != $(which php{{ phpng_version }})
17
27
{% endif %}
28
+ {% endif %}
You can’t perform that action at this time.
0 commit comments