diff --git a/roles/common/templates/tarsnap_sources.list.j2 b/roles/common/templates/tarsnap_sources.list.j2 index 94cbce3..b9dc0ec 100644 --- a/roles/common/templates/tarsnap_sources.list.j2 +++ b/roles/common/templates/tarsnap_sources.list.j2 @@ -1,4 +1,4 @@ -{% if ansible_distribution_version | version_compare('18.04', '==') %} +{% if ansible_distribution_version is version_compare('18.04', '==') %} # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" deb https://pkg.tarsnap.com/deb/artful ./ {% else %} diff --git a/roles/mariadb/templates/mariadb.list.j2 b/roles/mariadb/templates/mariadb.list.j2 index bfbc8dd..7d3679d 100644 --- a/roles/mariadb/templates/mariadb.list.j2 +++ b/roles/mariadb/templates/mariadb.list.j2 @@ -1,7 +1,7 @@ # {{ ansible_managed }} {% if ansible_distribution == 'Ubuntu' %} -{% if ansible_distribution_version | version_compare('18.04', '==') %} +{% if ansible_distribution_version is version_compare('18.04', '==') %} # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" deb [arch=amd64,i386] http://mariadb.mirror.serveriai.lt/repo/10.2/ubuntu artful main {% else %} diff --git a/roles/nginx/templates/nginx_org_sources.list.j2 b/roles/nginx/templates/nginx_org_sources.list.j2 index edbfe7f..d9b3d5b 100644 --- a/roles/nginx/templates/nginx_org_sources.list.j2 +++ b/roles/nginx/templates/nginx_org_sources.list.j2 @@ -2,14 +2,14 @@ {% if ansible_distribution == 'Ubuntu' %} {% if nginx_version == "stable" %} -{% if ansible_distribution_version | version_compare('18.04', '==') %} +{% if ansible_distribution_version is version_compare('18.04', '==') %} # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" deb https://nginx.org/packages/ubuntu/ artful nginx {% else %} deb https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx {% endif %} {% elif nginx_version == "mainline" %} -{% if ansible_distribution_version | version_compare('18.04', '==') %} +{% if ansible_distribution_version is version_compare('18.04', '==') %} # 2018-03-17: no Ubuntu 18.04 "bionic" packages yet, so use 17.10 "artful" deb https://nginx.org/packages/mainline/ubuntu/ artful nginx {% else %} diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2 index b7d140e..f7cc107 100644 --- a/roles/nginx/templates/vhost.conf.j2 +++ b/roles/nginx/templates/vhost.conf.j2 @@ -66,7 +66,7 @@ server { {# As of Ubuntu 16.04 and Debian 9, the PHP-FPM configs are the same #} {% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version_compare('9', '==')) %} fastcgi_pass unix:/run/php/php7.0-fpm-{{ domain_name }}.sock; - {% elif ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('18.04', '==') %} + {% elif ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('18.04', '==') %} fastcgi_pass unix:/run/php/php7.2-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 a7b35d6..dbaa102 100644 --- a/roles/php-fpm/tasks/main.yml +++ b/roles/php-fpm/tasks/main.yml @@ -9,7 +9,7 @@ - name: Configure php-fpm on Ubuntu 18.04 include_tasks: Ubuntu_18.04.yml - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('18.04', '==') + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('18.04', '==') tags: php-fpm # vim: set ts=2 sw=2: