From fe328883471fedde71edcc91c9612179b6e35885 Mon Sep 17 00:00:00 2001 From: gusttt Date: Thu, 18 Oct 2018 08:26:29 +0200 Subject: [PATCH 1/3] Only add repository key when nginx_repository is used. Fix #68 --- tasks/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 1cc0987..7479148 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,10 +2,14 @@ - import_tasks: prerequisites/install-prerequisites.yml - import_tasks: keys/apt-key.yml - when: ansible_os_family == "Debian" + when: + - ansible_os_family == "Debian" + - nginx_install_from == "nginx_repository" - import_tasks: keys/rpm-key.yml - when: ansible_os_family == "RedHat" or ansible_os_family == "Suse" + when: + - ansible_os_family == "RedHat" or ansible_os_family == "Suse" + - nginx_install_from == "nginx_repository" - name: "(Install: Debian/Ubuntu/CentOS/RedHat/FreeBSD) Install NGINX" block: From 42d1937b3a60e6cb80f09d7ccb4cf3f9ec9227b6 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 18 Oct 2018 21:39:10 +0200 Subject: [PATCH 2/3] Add extra checks for when the nginx repo is needed. --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 7479148..fc0a40f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,7 +4,7 @@ - import_tasks: keys/apt-key.yml when: - ansible_os_family == "Debian" - - nginx_install_from == "nginx_repository" + - nginx_install_from == "nginx_repository" or nginx_amplify_enable or nginx_controller_enable or nginx_unit_enable - import_tasks: keys/rpm-key.yml when: From c07792daee986d27dbb05ab8c9daeb98585d1e6e Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Thu, 18 Oct 2018 21:39:36 +0200 Subject: [PATCH 3/3] Add extra checks for when the nginx repo is needed. --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index fc0a40f..fc673af 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,7 +9,7 @@ - import_tasks: keys/rpm-key.yml when: - ansible_os_family == "RedHat" or ansible_os_family == "Suse" - - nginx_install_from == "nginx_repository" + - nginx_install_from == "nginx_repository" or nginx_amplify_enable or nginx_controller_enable or nginx_unit_enable - name: "(Install: Debian/Ubuntu/CentOS/RedHat/FreeBSD) Install NGINX" block: