Skip to content

Commit 3a63b9a

Browse files
sjuggeJurgen VerhasseltJurgen Verhasselt
authored
Add 'nginx_manage_repo' feature flag and defaults (#420)
Co-authored-by: Jurgen Verhasselt <[email protected]> Co-authored-by: Jurgen Verhasselt <[email protected]>
1 parent f1272ef commit 3a63b9a

File tree

11 files changed

+21
-2
lines changed

11 files changed

+21
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
FEATURES:
66

7+
* Add a `nginx_manage_repo` feature flag which allows disabling NGINX repo management by this role.
78
* Add a `nginx_install_epel_release` feature flag which allows epel-release to not be installed by this role if so desired.
89

910
## 0.20.0 (June 9, 2021)

defaults/main/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ nginx_type: opensource
3434
# Default is present.
3535
nginx_state: present
3636

37+
# Specify whether or not you want to manage the NGINX repositories.
38+
# Using 'true' will manage NGINX repositories.
39+
# Using 'false' will not manage the NGINX repositories, allowing them to be managed through other means.
40+
# Default is true
41+
nginx_manage_repo: true
42+
3743
# Specify repository origin for NGINX Open Source.
3844
# Options are 'nginx_repository', 'source' or 'os_repository'.
3945
# Only works if 'nginx_type' is set to 'opensource'.

tasks/opensource/install-alpine.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
path: /etc/apk/repositories
55
insertafter: EOF
66
line: "{{ nginx_repository | default(nginx_default_repository_alpine) }}"
7+
when: nginx_manage_repo | bool
78

89
- name: (Alpine Linux) Install NGINX
910
apk:

tasks/opensource/install-debian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
update_cache: true
77
mode: 0644
88
loop: "{{ nginx_repository | default(nginx_default_repository_debian) }}"
9+
when: nginx_manage_repo | bool
910

1011
- name: (Debian/Ubuntu) Install NGINX
1112
apt:

tasks/opensource/install-redhat.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
enabled: true
88
gpgcheck: true
99
mode: 0644
10-
when: ansible_facts['distribution_major_version'] is version('8', '<')
10+
when:
11+
- ansible_facts['distribution_major_version'] is version('8', '<')
12+
- nginx_manage_repo | bool
1113

1214
- name: (CentOS/RHEL 8) Configure NGINX repository
1315
blockinfile:
@@ -21,7 +23,9 @@
2123
name = NGINX Repository
2224
module_hotfixes = true
2325
mode: 0644
24-
when: ansible_facts['distribution_major_version'] is version('8', '==')
26+
when:
27+
- ansible_facts['distribution_major_version'] is version('8', '==')
28+
- nginx_manage_repo | bool
2529

2630
- name: (CentOS/RHEL) Install NGINX
2731
yum:

tasks/opensource/install-suse.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
zypper_repository:
44
name: "nginx-{{ nginx_branch }}"
55
repo: "{{ nginx_repository | default(nginx_default_repository_suse) }}"
6+
when: nginx_manage_repo | bool
67

78
- name: (SLES) Install NGINX
89
zypper:

tasks/plus/install-alpine.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
insertafter: EOF
66
line: "{{ nginx_repository | default(nginx_plus_default_repository_alpine) }}"
77
state: "{{ nginx_license_status | default ('present') }}"
8+
when: nginx_manage_repo | bool
89

910
- name: (Alpine Linux) Install NGINX Plus
1011
apk:

tasks/plus/install-debian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
update_cache: false
1919
state: "{{ nginx_license_status | default ('present') }}"
2020
mode: 0644
21+
when: nginx_manage_repo | bool
2122

2223
- name: (Debian/Ubuntu) Install NGINX Plus
2324
apt:

tasks/plus/install-freebsd.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
}
2121
state: "{{ nginx_license_status | default ('present') }}"
2222
mode: 0644
23+
when: nginx_manage_repo | bool
2324

2425
- name: (FreeBSD) Install NGINX Plus
2526
pkgng:

tasks/plus/install-redhat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
gpgcheck: true
1212
state: "{{ nginx_license_status | default ('present') }}"
1313
mode: 0644
14+
when: nginx_manage_repo | bool
1415

1516
- name: (Amazon Linux/CentOS/Oracle Linux/RHEL) Install NGINX Plus
1617
yum:

0 commit comments

Comments
 (0)