Skip to content

Commit ed6ba30

Browse files
authored
Bump Ansible collections (#205)
1 parent 57c91f0 commit ed6ba30

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
collections:
33
- name: community.general
4-
version: 5.1.1
4+
version: 5.5.0
55
- name: ansible.posix
66
version: 1.4.0
77
- name: community.docker
8-
version: 2.6.0
8+
version: 3.1.0

CHANGELOG.md

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

55
ENHANCEMENTS:
66

7-
Bump the Ansible `community.general` collection to `5.1.1`, `ansible.posix` collection to `1.4.0` and `community.docker` collection to `2.6.0`.
7+
Bump the Ansible `community.general` collection to `5.501`, `ansible.posix` collection to `1.4.0` and `community.docker` collection to `3.1.0`.
88

99
BUG FIXES:
1010

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this
2727
---
2828
collections:
2929
- name: community.general
30-
version: 5.1.1
30+
version: 5.5.0
3131
- name: ansible.posix
3232
version: 1.4.0
3333
- name: community.docker # Only required if you plan to use Molecule (see below)
34-
version: 2.6.0
34+
version: 3.1.0
3535
```
3636
3737
**Note:** You can alternatively install the Ansible community distribution (what is known as the "old" Ansible) if you don't want to manage individual collections.

molecule/advanced/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
8-
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
8+
content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
99
dest: ../../files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
1414
ansible.builtin.copy:
15-
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
15+
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444

molecule/specific-version/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
- name: Set NGINX App Protect WAF signature version fact
1515
ansible.builtin.set_fact:
1616
nginx_app_protect_waf_signatures_version: "{{ app_protect_signature_version_matrix[ansible_os_family | lower] }}{{ (ansible_os_family | lower == 'debian') | ternary('~' ~ ansible_distribution_release, '') }}"
17-
when: specify_app_protect_signatures_version| bool
17+
when: specify_app_protect_signatures_version | bool
1818

1919
- name: Set NGINX App Protect WAF threat campaigns version fact
2020
ansible.builtin.set_fact:
2121
nginx_app_protect_waf_threat_campaigns_version: "{{ app_protect_threat_campaigns_version_matrix[ansible_os_family | lower] }}{{ (ansible_os_family | lower == 'debian') | ternary('~' ~ ansible_distribution_release, '') }}"
22-
when: specify_app_protect_threat_campaigns_version| bool
22+
when: specify_app_protect_threat_campaigns_version | bool
2323

2424
- name: Install NGINX App Protect WAF
2525
ansible.builtin.include_role:

molecule/specific-version/verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
ansible.builtin.package_facts:
5959
manager: auto
6060

61-
- name: Verify installed NAP signatures version matches requested version # noqa var-spacing
61+
- name: Verify installed NAP signatures version matches requested version # noqa jinja[spacing]
6262
ansible.builtin.assert:
6363
that: "{{ (ansible_facts.packages['app-protect-attack-signatures'] | map(attribute='version') | first) == (app_protect_signature_version_matrix[ansible_os_family | lower] | regex_replace('^-|=','') + (ansible_os_family | lower == 'debian') | ternary('~' ~ ansible_distribution_release, '')) }}"
6464

65-
- name: Verify installed NAP threat campaigns version matches requested version # noqa var-spacing
65+
- name: Verify installed NAP threat campaigns version matches requested version # noqa jinja[spacing]
6666
ansible.builtin.assert:
6767
that: "{{ (ansible_facts.packages['app-protect-threat-campaigns'] | map(attribute='version') | first) == (app_protect_threat_campaigns_version_matrix[ansible_os_family | lower] | regex_replace('^-|=','') + (ansible_os_family | lower == 'debian') | ternary('~' ~ ansible_distribution_release, '')) }}"

molecule/uninstall/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
77
ansible.builtin.copy:
8-
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
8+
content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
99
dest: ../../files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
1414
ansible.builtin.copy:
15-
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
15+
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
1818
mode: 0444

tasks/common/config/configure-app-protect.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
backup: true
3434
mode: 0644
3535
loop: "{{ nginx_app_protect_log_policy_file }}"
36-
when: nginx_app_protect_log_policy_file_enable | bool
36+
when: nginx_app_protect_log_policy_file_enable | bool

tasks/common/prerequisites/install-dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
enabled: true
3737
gpgcheck: true
3838
gpgkey: https://ftp.heanet.ie/pub/centos/7/os/$basearch/RPM-GPG-KEY-CentOS-7
39-
state: "{{ nginx_app_protect_license_status | default ('present') }}"
39+
state: "{{ nginx_app_protect_license_status | default('present') }}"
4040
when:
4141
- ansible_distribution_major_version == "7"
4242
- not nginx_app_protect_use_rhel_subscription_repos | bool
@@ -49,7 +49,7 @@
4949
enabled: true
5050
gpgcheck: true
5151
gpgkey: http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7
52-
state: "{{ nginx_app_protect_license_status | default ('present') }}"
52+
state: "{{ nginx_app_protect_license_status | default('present') }}"
5353
when:
5454
- ansible_distribution_major_version == "7"
5555
- not nginx_app_protect_use_rhel_subscription_repos | bool

0 commit comments

Comments
 (0)