Browse Source

Use iteritems() instead of items().

Signed-off-by: René Jochum <rene@jochums.at>
tags/v0.34.0
René Jochum 9 years ago
parent
commit
ca15a1fa4e
2 changed files with 5 additions and 4 deletions
  1. +4
    -0
      php/init.sls
  2. +1
    -4
      php/ng/fpm/pools_config.sls

+ 4
- 0
php/init.sls View File

@@ -1,5 +1,7 @@
{% from "php/map.jinja" import php with context %}

{% if not 'ng' in salt['pillar.get']('php', {}) %}

{% if grains['os_family']=="Debian" %}
{% set use_ppa = salt['pillar.get']('php:use_ppa', none) %}
{% if use_ppa is not none %}
@@ -18,3 +20,5 @@ php54:
php:
pkg.installed:
- name: {{ php.php_pkg }}

{% endif %}

+ 1
- 4
php/ng/fpm/pools_config.sls View File

@@ -9,7 +9,7 @@

{% set pool_states = [] %}

{% for pool, config in php.fpm.pools.items() %}
{% for pool, config in php.fpm.pools.iteritems() %}
{% set state = 'php_fpm_pool_conf_' ~ loop.index0 %}
{% set fpath = path_join(pool, php.lookup.fpm.pools) %}

@@ -29,6 +29,3 @@

{% do pool_states.append(state) %}
{% endfor %}




Loading…
Cancel
Save