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

Merge pull request #145 from aboe76/python3_support

Browse Source 
fix iteritems for python3
This commit is contained in:
Javier Bértoli 2018-03-10 15:32:01 -03:00 committed by GitHub
commit a4966f00e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php/ng/cli/ini.sls
View File

@ -3,7 +3,7 @@
{% from "php/ng/ini.jinja" import php_ini %} {% from "php/ng/ini.jinja" import php_ini %}
{% set settings = php.ini.defaults %} {% set settings = php.ini.defaults %}
{% for key, value in php.cli.ini.settings.iteritems() %} {% for key, value in php.cli.ini.settings.items() %}
{% if settings[key] is defined %} {% if settings[key] is defined %}
{% do settings[key].update(value) %} {% do settings[key].update(value) %}
{% else %} {% else %}

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

@ -3,7 +3,7 @@
{% from "php/ng/ini.jinja" import php_ini %} {% from "php/ng/ini.jinja" import php_ini %}
{% set ini_settings = php.ini.defaults %} {% set ini_settings = php.ini.defaults %}
{% for key, value in php.fpm.config.ini.settings.iteritems() %} {% for key, value in php.fpm.config.ini.settings.items() %}
{% if ini_settings[key] is defined %} {% if ini_settings[key] is defined %}
{% do ini_settings[key].update(value) %} {% do ini_settings[key].update(value) %}
{% else %} {% else %}

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

@ -9,9 +9,9 @@
{% set pool_states = [] %} {% set pool_states = [] %}
{% for pool, config in php.fpm.pools.iteritems() %} {% for pool, config in php.fpm.pools.items() %}
{% if pool == 'defaults' %}{% continue %}{% endif %} {% if pool == 'defaults' %}{% continue %}{% endif %}
{% for pkey, pvalues in config.get('settings', {}).iteritems() %} {% for pkey, pvalues in config.get('settings', {}).items() %}
{% set pool_defaults = php.fpm.pools.get('defaults', {}).copy() %} {% set pool_defaults = php.fpm.pools.get('defaults', {}).copy() %}
{% do pool_defaults.update(pvalues) %} {% do pool_defaults.update(pvalues) %}
{% do pvalues.update(pool_defaults) %} {% do pvalues.update(pool_defaults) %}

2
php/ng/xcache/ini.sls
View File

@ -3,7 +3,7 @@
{% from "php/ng/ini.jinja" import php_ini %} {% from "php/ng/ini.jinja" import php_ini %}
{% set settings = php.xcache.ini.defaults %} {% set settings = php.xcache.ini.defaults %}
{% for key, value in php.xcache.ini.settings.iteritems() %} {% for key, value in php.xcache.ini.settings.items() %}
{% if settings[key] is defined %} {% if settings[key] is defined %}
{% do settings[key].update(value) %} {% do settings[key].update(value) %}
{% else %} {% else %}