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

fix(php/ng): don't iterate on string, make sure list is not string

Browse Source
This commit is contained in:
Arthur Lutz 2019-04-05 15:08:30 +02:00
parent a98aa7e81a
commit dbb542c4fb
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
php/ng/fpm/config.sls
View File

@ -11,11 +11,11 @@
{% endif %}
{% endfor %}
{% if salt['pillar.get']('php:ng:version') is iterable %}
{% for version in salt['pillar.get']('php:ng:version') %}
{% 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 conf_settings = odict(php.lookup.fpm.defaults) %}
{% set first_version = salt['pillar.get']('php:ng:version')[0]|string %}
{% set first_version = pillar_php_ng_version[0]|string %}
{% set ini = php.lookup.fpm.ini|replace(first_version, version) %}
{% set conf = php.lookup.fpm.conf|replace(first_version, version) %}
{% set pools = php.lookup.fpm.pools|replace(first_version, version) %}

9
php/ng/fpm/init.sls
View File

@ -5,12 +5,13 @@ include:
- php.ng.fpm.service
- php.ng.fpm.pools
{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
extend:
php_fpm_service:
service:
- watch:
{% if salt['pillar.get']('php:ng:version') is iterable %}
{% for version in salt['pillar.get']('php:ng:version') %}
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
{% for version in pillar_php_ng_version %}
- file: php_fpm_ini_config_{{ version }}
- file: php_fpm_conf_config_{{ version }}
{% endfor %}
@ -20,8 +21,8 @@ extend:
{% endif %}
- require:
- sls: php.ng.fpm.config
{% if salt['pillar.get']('php:ng:version') is iterable %}
{% for version in salt['pillar.get']('php:ng:version') %}
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
{% for version in pillar_php_ng_version %}
php_fpm_ini_config_{{ version }}:
file:
- require:

5
php/ng/fpm/pools_config.sls
View File

@ -18,9 +18,10 @@
{% endfor %}
{% set state = 'php_fpm_pool_conf_' ~ loop.index0 %}
{% if salt['pillar.get']('php:ng:version') is iterable %}
{% 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 %}
{% set first_fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}
{% set first_version = salt['pillar.get']('php:ng:version')[0]|string %}
{% set first_version = pillar_php_ng_version[0]|string %}
{% set fpath = first_fpath.replace(first_version, config.get('phpversion', '7.0')) %}
{% else %}
{% set fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}

13
php/ng/installed.jinja
View File

@ -10,15 +10,16 @@
{% set pkgs = [] %}
{% set specials = [] %}
{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
{% if pkginfo is iterable and pkginfo is not string %}
{% for pkg in pkginfo %}
{% if pkg is mapping %}
{% do specials.append(pkg) %}
{% else %}
{% do pkgs.append(pkg) %}
{% if salt['pillar.get']('php:ng:version') is iterable %}
{% set first_version = salt['pillar.get']('php:ng:version')[0]|string %}
{% for other_version in salt['pillar.get']('php:ng:version') %}
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
{% set first_version = pillar_php_ng_version[0]|string %}
{% for other_version in pillar_php_ng_version %}
{% set other_version_str = other_version|string %}
{% do pkgs.append(pkg.replace(first_version, other_version_str)) %}
{% endfor %}
@ -27,9 +28,9 @@
{% endfor %}
{% else %}
{% do pkgs.append(pkginfo) %}
{% if salt['pillar.get']('php:ng:version') is iterable %}
{% set first_version = salt['pillar.get']('php:ng:version')[0]|string %}
{% for other_version in salt['pillar.get']('php:ng:version') %}
{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
{% set first_version = pillar_php_ng_version[0]|string %}
{% for other_version in pillar_php_ng_version %}
{% set other_version_str = other_version|string %}
{% do pkgs.append(pkginfo.replace(first_version, other_version_str)) %}
{% endfor %}

7
php/ng/map.jinja
View File

@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
# vim: ft=jinja
{%- if salt['pillar.get']('php:ng:version') is iterable %}
{%- set phpng_version = salt['pillar.get']('php:ng:version')[0]|string %}
{% 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 %}
{%- set phpng_version = pillar_php_ng_version[0]|string %}
{% else %}
{%- set phpng_version = salt['pillar.get']('php:ng:version', '7.0')|string %}
{%- set phpng_version = pillar_php_ng_version|string %}
{% endif %}
{%- set freebsd_phpng_version = phpng_version.replace('.', '') %}