diff --git a/php/ng/cli/ini.sls b/php/ng/cli/ini.sls index 77f6713..6844192 100644 --- a/php/ng/cli/ini.sls +++ b/php/ng/cli/ini.sls @@ -3,7 +3,7 @@ {% from "php/ng/ini.jinja" import php_ini %} {% 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 %} {% do settings[key].update(value) %} {% else %} diff --git a/php/ng/fpm/config.sls b/php/ng/fpm/config.sls index 5110866..997073f 100644 --- a/php/ng/fpm/config.sls +++ b/php/ng/fpm/config.sls @@ -3,7 +3,7 @@ {% from "php/ng/ini.jinja" import php_ini %} {% 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 %} {% do ini_settings[key].update(value) %} {% else %} diff --git a/php/ng/fpm/pools_config.sls b/php/ng/fpm/pools_config.sls index 9a66a55..625f303 100644 --- a/php/ng/fpm/pools_config.sls +++ b/php/ng/fpm/pools_config.sls @@ -9,9 +9,9 @@ {% set pool_states = [] %} -{% for pool, config in php.fpm.pools.iteritems() %} +{% for pool, config in php.fpm.pools.items() %} {% 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() %} {% do pool_defaults.update(pvalues) %} {% do pvalues.update(pool_defaults) %} diff --git a/php/ng/xcache/ini.sls b/php/ng/xcache/ini.sls index bbea836..c497788 100644 --- a/php/ng/xcache/ini.sls +++ b/php/ng/xcache/ini.sls @@ -3,7 +3,7 @@ {% from "php/ng/ini.jinja" import php_ini %} {% 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 %} {% do settings[key].update(value) %} {% else %}