majic-ansible-roles Changeset

Changeset - 48fc6c243b24

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Branko Majic (branko) - 4 years ago 2020-05-07 22:38:58
branko@majic.rs

MAR-149: Use the .items() method instead of .iteritems() on dicts in Jinja2 templates.

4 files changed with 4 insertions and 4 deletions:

roles/php_website/templates/fpm_site.conf.j2

roles/wsgi_website/templates/environment.sh.j2

roles/wsgi_website/templates/nginx_site.j2

roles/wsgi_website/templates/systemd_wsgi_website.service.j2

0 comments (0 inline, 0 general)

roles/php_website/templates/fpm_site.conf.j2

➞

Show inline comments

@@ @@ -27,6 +27,6 @@ chdir = / @@
 ; to log errors in site-specific log file.
 catch_workers_output = yes
-{% for var, val in additional_fpm_config.iteritems() %}
+{% for var, val in additional_fpm_config.items() %}
 {{ var }} = {{ val }}
 {% endfor %}

roles/wsgi_website/templates/environment.sh.j2

➞

Show inline comments

-{% for var, val in environment_variables.iteritems() %}
+{% for var, val in environment_variables.items() %}
 export {{ var }}='{{ val }}'
 {% endfor %}

roles/wsgi_website/templates/nginx_site.j2

➞

Show inline comments

@@ @@ -59,7 +59,7 @@ server { @@
         proxy_set_header Host $http_host;
         proxy_redirect off;
-    {% for header, value in proxy_headers.iteritems() -%}
+    {% for header, value in proxy_headers.items() -%}
     proxy_set_header {{ header }} {{ value }};
     {% endfor -%}

roles/wsgi_website/templates/systemd_wsgi_website.service.j2

➞

Show inline comments

@@ @@ -9,7 +9,7 @@ Group={{ user }} @@
 WorkingDirectory={{ home }}/code
 ExecStart={{ home }}/virtualenv/bin/gunicorn --bind unix:/run/wsgi/{{ fqdn }}.sock {% if use_paste %}--paste {{home}}/code/{{ wsgi_application }}{% else %}{{ wsgi_application }}{% endif %}
-{% for var, val in environment_variables.iteritems() %}
+{% for var, val in environment_variables.items() %}
 Environment="{{ var }}={{ val }}"
 {% endfor %}

0 comments (0 inline, 0 general)