Installs packages in focal.
This commit is contained in:
parent
f062dccc8d
commit
11fb54e504
@ -14,7 +14,7 @@
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
{%- set pillar_php_version = php.pillar_php_version %}
|
||||
{%- set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
|
||||
{%- if pillar_php_version is iterable and pillar_php_version is not string %}
|
||||
{%- for version in pillar_php_version %}
|
||||
{%- set conf_settings = odict(php.lookup.fpm.defaults) %}
|
||||
|
@ -6,6 +6,8 @@ include:
|
||||
- php.fpm.pools
|
||||
|
||||
extend:
|
||||
{%- set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
|
||||
|
||||
{% if pillar_php_version is iterable and pillar_php_version is not string %}
|
||||
{% for version in pillar_php_version %}
|
||||
|
||||
|
@ -768,7 +768,7 @@
|
||||
{%- endif %}
|
||||
{%- else %}
|
||||
{%- if salt['grains.get']('osrelease')|string >= '18.04' %}
|
||||
{%- merge = php, salt['pillar.get']('php', {
|
||||
{%- set php = salt['pillar.get']('php', {
|
||||
'lookup': salt['grains.filter_by']({
|
||||
'Ubuntu': {
|
||||
'pkgs': {
|
||||
|
Loading…
Reference in New Issue
Block a user