diff --git a/defaults/main.yml b/defaults/main.yml index 786d9ca..7cb8c78 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,6 +27,10 @@ cache_timeout: 600 repo_centos_epel_mirror: "{{ centos_epel_mirror | default('http://download.fedoraproject.org/pub/epel') }}" repo_centos_epel_key: "{{ centos_epel_key | default('http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7') }}" +## Centos NGINX repository options +repo_centos_nginx_mirror: "{{ centos_nginx_mirror | default('http://nginx.org/packages/centos/7/$basearch/') }}" +repo_centos_nginx_key: "{{ centos_nginx_key | default('http://nginx.org/keys/nginx_signing.key') }}" + # Set the package install state for distribution and pip packages # Options are 'present' and 'latest' repo_server_package_state: "latest" diff --git a/tasks/repo_install.yml b/tasks/repo_install.yml index ecb6708..dca46a4 100644 --- a/tasks/repo_install.yml +++ b/tasks/repo_install.yml @@ -44,8 +44,8 @@ yum_repository: name: nginx description: 'nginx repo' - baseurl: "{{ repo_nginx_repo }}" - gpgkey: "{{ repo_nginx_gpg_key }}" + baseurl: "{{ repo_centos_nginx_mirror }}" + gpgkey: "{{ repo_centos_nginx_key }}" when: - ansible_pkg_mgr in ['yum', 'dnf'] register: add_nginx_repo diff --git a/vars/redhat.yml b/vars/redhat.yml index c2e0e4e..9b4fa75 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -15,8 +15,6 @@ systemd_utils_prefix: "/lib/systemd" -repo_nginx_repo: http://nginx.org/packages/centos/7/$basearch/ -repo_nginx_gpg_key: http://nginx.org/keys/nginx_signing.key repo_nginx_pid: /run/nginx.pid git_daemon_path: /usr/libexec/git-core/git-daemon