Skip to content

Commit

Permalink
update meta to include RHEL9 and Ubuntu Noble. Fixed issue with insta…
Browse files Browse the repository at this point in the history
…ll repositories.
  • Loading branch information
EmptyByte committed Jun 13, 2024
1 parent 705b025 commit 0215a03
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ galaxy_info:
platforms:
- name: EL
versions:
- 7
- 7
- 8
- 9
- name: Ubuntu
versions:
- bionic
- focal
- jammy
- noble
- name: Debian
versions:
- buster
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
mode: "{{ template_nginx_artifactory.mode }}"
notify: Restart Nginx

- name: Ensure nginx dir exists
- name: Ensure Nginx dir exists
become: true
ansible.builtin.file:
path: '/var/opt/jfrog/nginx/ssl'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
ansible.builtin.dnf:
name: "{{ nginx_packages }}"
state: present
disablerepo: "{{ '*' if nginx_setup_repos or not nginx_system_repositories else omit }}"
enablerepo: "{{ nginx_system_repositories if nginx_setup_repos or not nginx_system_repositories else omit }}"
disablerepo: "{{ '*' if nginx_system_repositories is defined and nginx_system_repositories | length > 0 else omit }}"
enablerepo: "{{ nginx_system_repositories if nginx_system_repositories is defined and nginx_system_repositories | length > 0 else omit }}"
become: true
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
ansible.builtin.yum:
name: "{{ nginx_packages }}"
state: present
disablerepo: "{{ '*' if nginx_setup_repos or not nginx_system_repositories else omit }}"
enablerepo: "{{ nginx_system_repositories if nginx_setup_repos or not nginx_system_repositories else omit }}"
disablerepo: "{{ '*' if nginx_system_repositories is defined and nginx_system_repositories | length > 0 else omit }}"
enablerepo: "{{ nginx_system_repositories if nginx_system_repositories is defined and nginx_system_repositories | length > 0 else omit }}"
become: true
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
- name: Import nginx signing key
- name: Import Nginx signing key
ansible.builtin.apt_key:
url: "{{ nginx_repo_signing_key }}"
state: present
become: true

- name: Add nginx stable repo
- name: Add Nginx stable repo
ansible.builtin.apt_repository:
repo: "deb {{ nginx_official_repo_url }} {{ ansible_facts['ansible_distribution_release'] | lower }} nginx"
filename: "{{ nginx_official_repo_filename }}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
- name: Import nginx signing key
- name: Import Nginx signing key
ansible.builtin.rpm_key:
key: "{{ nginx_official_repo_signing_key }}"
state: present
become: true

- name: Add nginx stable repo
- name: Add Nginx stable repo
ansible.builtin.yum_repository:
name: "{{ nginx_official_repo_filename }}"
description: "{{ nginx_official_repo_description }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ nginx_packages:

nginx_system_daemon: nginx

nginx_system_repositories: "{% if ansible_facts['distribution'] | lower == 'redhat' %}\
['rhel-{{ ansible_facts['distribution_major_version'] }}-for-x86_64-baseos-rpms',\
'rhel-{{ ansible_facts['distribution_major_version'] }}-for-x86_64-appstream-rpms']\
{% else %}\
[]\
{% endif %}"
nginx_system_repositories: >-
{%- if ansible_facts['distribution'] | lower == 'redhat' -%}
['rhel-{{ ansible_facts['distribution_major_version'] }}-for-x86_64-baseos-rpms',
'rhel-{{ ansible_facts['distribution_major_version'] }}-for-x86_64-appstream-rpms']
{%- else -%}
[]
{%- endif -%}
###########################
## CERTIFICATES ##
Expand Down

0 comments on commit 0215a03

Please sign in to comment.