Merge pull request #69 from gusttt/gpgkeyrepo

Only add repository key when nginx_repository is used.
This commit is contained in:
Alessandro Fael Garcia 2018-10-18 13:57:42 -07:00 committed by GitHub
commit 373ab3a796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,10 +2,14 @@
- import_tasks: prerequisites/install-prerequisites.yml - import_tasks: prerequisites/install-prerequisites.yml
- import_tasks: keys/apt-key.yml - import_tasks: keys/apt-key.yml
when: ansible_os_family == "Debian" when:
- ansible_os_family == "Debian"
- nginx_install_from == "nginx_repository" or nginx_amplify_enable or nginx_controller_enable or nginx_unit_enable
- import_tasks: keys/rpm-key.yml - 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" or nginx_amplify_enable or nginx_controller_enable or nginx_unit_enable
- name: "(Install: Debian/Ubuntu/CentOS/RedHat/FreeBSD) Install NGINX" - name: "(Install: Debian/Ubuntu/CentOS/RedHat/FreeBSD) Install NGINX"
block: block: