From 207a2f60118354ea5d09465144aa729e45e1a76d Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Wed, 23 Aug 2017 01:49:27 +0200 Subject: [PATCH] Improve distribution verification --- admin-users/tasks/main.yml | 3 +-- apt/tasks/main.yml | 8 +++----- evoacme/tasks/main.yml | 8 +++----- evolinux-base/tasks/main.yml | 3 +-- php/tasks/main.yml | 3 +-- squid/tasks/main.yml | 3 +-- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/admin-users/tasks/main.yml b/admin-users/tasks/main.yml index 420c1427..6a1d1506 100644 --- a/admin-users/tasks/main.yml +++ b/admin-users/tasks/main.yml @@ -3,8 +3,7 @@ - fail: msg: only compatible with Debian >= 8 when: - - ansible_distribution == "Debian" - - ansible_distribution_major_version | version_compare('8', '<') + - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - debug: msg: "Warning: empty 'admin_users' variable, tasks will be skipped!" diff --git a/apt/tasks/main.yml b/apt/tasks/main.yml index b179ba4f..7bb8950e 100644 --- a/apt/tasks/main.yml +++ b/apt/tasks/main.yml @@ -1,11 +1,9 @@ --- -- name: Fail if distribution is not supported - fail: - msg: "Error: '{{ ansible_os_family }} {{ ansible_distribution_release }}' is not a supported distribution." +- fail: + msg: only compatible with Debian >= 8 when: - - ansible_distribution_release != "jessie" - - ansible_distribution_release != "stretch" + - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') tags: - apt diff --git a/evoacme/tasks/main.yml b/evoacme/tasks/main.yml index 07a1d5d2..beac178e 100644 --- a/evoacme/tasks/main.yml +++ b/evoacme/tasks/main.yml @@ -1,11 +1,9 @@ --- -- name: Fail if distribution is not supported - fail: - msg: "Error: '{{ ansible_os_family }} {{ ansible_distribution_release }}' is not a supported distribution." +- fail: + msg: only compatible with Debian >= 8 when: - - ansible_distribution_release != "jessie" - - ansible_distribution_release != "stretch" + - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - include: certbot.yml diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml index 1cc27278..5c1ad594 100644 --- a/evolinux-base/tasks/main.yml +++ b/evolinux-base/tasks/main.yml @@ -3,8 +3,7 @@ - fail: msg: only compatible with Debian >= 8 when: - - ansible_distribution == "Debian" - - ansible_distribution_major_version | version_compare('8', '<') + - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - name: Hostname include: hostname.yml diff --git a/php/tasks/main.yml b/php/tasks/main.yml index 7f438569..7ea4269c 100644 --- a/php/tasks/main.yml +++ b/php/tasks/main.yml @@ -3,8 +3,7 @@ - fail: msg: only compatible with Debian >= 8 when: - - ansible_distribution == "Debian" - - ansible_distribution_major_version | version_compare('8', '<') + - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - include: php_jessie.yml when: ansible_distribution_release == "jessie" diff --git a/squid/tasks/main.yml b/squid/tasks/main.yml index 5d81a670..542730bb 100644 --- a/squid/tasks/main.yml +++ b/squid/tasks/main.yml @@ -3,8 +3,7 @@ - fail: msg: only compatible with Debian >= 8 when: - - ansible_distribution == "Debian" - - ansible_distribution_major_version | version_compare('8', '<') + - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('8', '<') - name: "Set squid name (jessie)" set_fact: