From d155898bb1a4faf7c97c5cdaace27aa981977414 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Wed, 21 Mar 2018 21:17:21 +0200 Subject: [PATCH] Use new syntax for Jinj2 filters that are used as tests Ansible 2.5.0 uses a new syntax for Jinja2 filters that are used as tests. See: https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.5.html --- roles/common/tasks/firewall_Debian.yml | 6 +++--- roles/common/tasks/firewall_Ubuntu.yml | 6 +++--- roles/nginx/tasks/letsencrypt.yml | 4 ++-- roles/nginx/templates/vhost.conf.j2 | 2 +- roles/php-fpm/tasks/main.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/common/tasks/firewall_Debian.yml b/roles/common/tasks/firewall_Debian.yml index a8b64e4..aaf4b67 100644 --- a/roles/common/tasks/firewall_Debian.yml +++ b/roles/common/tasks/firewall_Debian.yml @@ -1,6 +1,6 @@ --- - name: Install firewalld and deps - when: ansible_distribution_major_version | version_compare('8', '>=') + when: ansible_distribution_major_version is version_compare('8', '>=') apt: pkg={{ item }} state=present with_items: - firewalld @@ -8,11 +8,11 @@ tags: packages - name: Copy firewalld public zone file - when: ansible_distribution_major_version | version_compare('8', '>=') + when: ansible_distribution_major_version is version_compare('8', '>=') template: src=public.xml.j2 dest=/etc/firewalld/zones/public.xml owner=root mode=0600 - name: Format public.xml firewalld zone file - when: ansible_distribution_major_version | version_compare('8', '>=') + when: ansible_distribution_major_version is version_compare('8', '>=') command: tidy -xml -iq -m -w 0 /etc/firewalld/zones/public.xml notify: - reload firewalld diff --git a/roles/common/tasks/firewall_Ubuntu.yml b/roles/common/tasks/firewall_Ubuntu.yml index 277ee3e..c295f2a 100644 --- a/roles/common/tasks/firewall_Ubuntu.yml +++ b/roles/common/tasks/firewall_Ubuntu.yml @@ -1,6 +1,6 @@ --- - name: Install firewalld and deps - when: ansible_distribution_version | version_compare('15.04', '>=') + when: ansible_distribution_version is version_compare('15.04', '>=') apt: pkg={{ item }} state=present with_items: - firewalld @@ -8,11 +8,11 @@ tags: packages - name: Copy firewalld public zone file - when: ansible_distribution_version | version_compare('15.04', '>=') + when: ansible_distribution_version is version_compare('15.04', '>=') template: src=public.xml.j2 dest=/etc/firewalld/zones/public.xml owner=root mode=0600 - name: Format public.xml firewalld zone file - when: ansible_distribution_version | version_compare('15.04', '>=') + when: ansible_distribution_version is version_compare('15.04', '>=') command: tidy -xml -iq -m -w 0 /etc/firewalld/zones/public.xml notify: - reload firewalld diff --git a/roles/nginx/tasks/letsencrypt.yml b/roles/nginx/tasks/letsencrypt.yml index 8f448e9..18efad9 100644 --- a/roles/nginx/tasks/letsencrypt.yml +++ b/roles/nginx/tasks/letsencrypt.yml @@ -16,7 +16,7 @@ # dependencies certbot checks for on its first run # taken from running certbot right after a clean Ubuntu 16.04 install - name: Install certbot dependencies (Ubuntu 16.04) - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('16.04', '==') + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==') apt: name={{ item }} state=present update_cache=yes with_items: - augeas-doc @@ -60,7 +60,7 @@ # dependencies certbot checks for on its first run # taken from running certbot right after a clean Debian 9 install - name: Install certbot dependencies (Debian 9) - when: ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==') + when: ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==') apt: name={{ item }} state=present update_cache=yes with_items: - augeas-doc diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2 index c12d742..73748bc 100644 --- a/roles/nginx/templates/vhost.conf.j2 +++ b/roles/nginx/templates/vhost.conf.j2 @@ -64,7 +64,7 @@ server { fastcgi_param HTTP_PROXY ""; {# As of Ubuntu 16.04 and Debian 9, the PHP-FPM configs are the same #} - {% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==')) %} + {% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==')) %} fastcgi_pass unix:/run/php/php7.0-fpm-{{ domain_name }}.sock; {% else %} fastcgi_pass unix:/var/run/php5-fpm-{{ domain_name }}.sock; diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml index b9abec4..77c5994 100644 --- a/roles/php-fpm/tasks/main.yml +++ b/roles/php-fpm/tasks/main.yml @@ -4,7 +4,7 @@ - name: Configure php-fpm on Ubuntu and Debian 9 import_tasks: Ubuntu.yml - when: ansible_distribution == 'Ubuntu' or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==')) + when: ansible_distribution == 'Ubuntu' or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==')) tags: php-fpm # vim: set ts=2 sw=2: