From 088978eafdfd7143aad9d50816e23e78d4814cd3 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 16 Feb 2018 18:06:11 +0100 Subject: [PATCH] library/roles/nginx/tasks/nginx.yml: Be ready for ubuntu 16.04. --- nginx/tasks/nginx.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nginx/tasks/nginx.yml b/nginx/tasks/nginx.yml index 25c6b10..897b376 100644 --- a/nginx/tasks/nginx.yml +++ b/nginx/tasks/nginx.yml @@ -10,13 +10,23 @@ apt: pkg={{ item }} state={{ nginx_package_state }} update_cache=yes cache_valid_time=1800 with_items: - nginx-full - when: not nginx_use_ldap_pam_auth + when: + - not nginx_use_ldap_pam_auth + - ansible_distribution_major_version <= '14' tags: nginx - name: Install the nginx web server if we need ldap auth via pam apt: pkg={{ item }} state={{ nginx_package_state }} update_cache=yes cache_valid_time=1800 with_items: - nginx-extras - when: nginx_use_ldap_pam_auth + when: + - nginx_use_ldap_pam_auth + - ansible_distribution_major_version <= '14' tags: nginx +- name: Install the nginx web server on Ubuntu >= 16.04 + apt: pkg={{ item }} state={{ nginx_package_state }} update_cache=yes cache_valid_time=1800 + with_items: + - nginx + when: ansible_distribution_major_version >= '16' + tags: nginx