Browse Source

Installs packages in focal.

pull/214/head
Wayne Gemmell 4 years ago
parent
commit
b22d2232ba
3 changed files with 4 additions and 2 deletions
  1. +1
    -1
      php/fpm/config.sls
  2. +2
    -0
      php/fpm/init.sls
  3. +1
    -1
      php/map.jinja

+ 1
- 1
php/fpm/config.sls View File

{%- 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
- 0
php/fpm/init.sls View File

- 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 %}



+ 1
- 1
php/map.jinja View File

{%- 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': {

Loading…
Cancel
Save