From 82b6fe1eff61f6d5f9ed2635fc3098372ff9e5dc Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 25 Oct 2018 17:03:34 +0200 Subject: [PATCH] shibbolet sp role: support trusty. --- shibbolet-sp-2/defaults/main.yml | 4 ++++ shibbolet-sp-2/tasks/main.yml | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/shibbolet-sp-2/defaults/main.yml b/shibbolet-sp-2/defaults/main.yml index 5aafc738..e61f17b4 100644 --- a/shibbolet-sp-2/defaults/main.yml +++ b/shibbolet-sp-2/defaults/main.yml @@ -6,5 +6,9 @@ shibbolet_pkg_list: - shibboleth-sp2-utils - curl +shibbolet_pkg_list_trusty: + - shibboleth-sp2-schemas + - curl + shibbolet_apache_module_pkg: - libapache2-mod-shib2 diff --git a/shibbolet-sp-2/tasks/main.yml b/shibbolet-sp-2/tasks/main.yml index 519dd8a9..f20e8a07 100644 --- a/shibbolet-sp-2/tasks/main.yml +++ b/shibbolet-sp-2/tasks/main.yml @@ -1,12 +1,15 @@ --- - block: - name: Install the shibbolet packages - apt: pkg={{ item }} state={{ shibbolet_pkg_state }} cache_valid_time=1800 update_cache=yes - with_items: '{{ shibbolet_pkg_list }}' + apt: pkg={{ shibbolet_pkg_list }} state={{ shibbolet_pkg_state }} cache_valid_time=1800 update_cache=yes + when: is_not_trusty + + - name: Install the shibbolet packages on Trusty + apt: pkg={{ shibbolet_pkg_list_trusty }} state={{ shibbolet_pkg_state }} cache_valid_time=1800 update_cache=yes + when: is_not_trusty - name: Install the shibbolet apache module - apt: pkg={{ item }} state={{ shibbolet_pkg_state }} cache_valid_time=1800 update_cache=yes - with_items: '{{ shibbolet_apache_module_pkg }}' + apt: pkg={{ shibbolet_apache_module_pkg }} state={{ shibbolet_pkg_state }} cache_valid_time=1800 update_cache=yes - name: Enable the apache shib2 module apache2_module: name=shib2 state=present