saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Installs packages in focal.

Browse Source
This commit is contained in:
Wayne Gemmell 2020-06-08 22:17:08 +02:00
parent f062dccc8d
commit 11fb54e504
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php/fpm/config.sls
View File

@ -14,7 +14,7 @@
{%- endif %} {%- endif %}
{%- endfor %} {%- 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 %} {%- if pillar_php_version is iterable and pillar_php_version is not string %}
{%- for version in pillar_php_version %} {%- for version in pillar_php_version %}
{%- set conf_settings = odict(php.lookup.fpm.defaults) %} {%- set conf_settings = odict(php.lookup.fpm.defaults) %}

2
php/fpm/init.sls
View File

@ -6,6 +6,8 @@ include:
- php.fpm.pools - php.fpm.pools
extend: 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 %} {% if pillar_php_version is iterable and pillar_php_version is not string %}
{% for version in pillar_php_version %} {% for version in pillar_php_version %}

2
php/map.jinja
View File

@ -768,7 +768,7 @@
{%- endif %} {%- endif %}
{%- else %} {%- else %}
{%- if salt['grains.get']('osrelease')|string >= '18.04' %} {%- 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']({ 'lookup': salt['grains.filter_by']({
'Ubuntu': { 'Ubuntu': {
'pkgs': { 'pkgs': {