Skip to content

Commit 2214656

Browse files
authored
Bump Ansible collections (#166)
1 parent 52e09c4 commit 2214656

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
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: 3.8.0
4+
version: 4.4.0
55
- name: ansible.posix
66
version: 1.3.0
77
- name: community.docker
8-
version: 2.0.0
8+
version: 2.1.1

CHANGELOG.md

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

55
ENHANCEMENTS:
66

7-
Add signing keys to a unique NGINX keyring on Debian based systems.
7+
* Add signing keys to a unique NGINX keyring on Debian based systems.
8+
* Bump the Ansible `community.general` collection to `4.4.0` and `community.docker` collection to `2.1.1`.
89

910
BUG FIXES:
1011

README.md

Lines changed: 4 additions & 4 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: 3.8.0
30+
version: 4.4.0
3131
- name: ansible.posix
3232
version: 1.3.0
3333
- name: community.docker # Only required if you plan to use Molecule (see below)
34-
version: 2.0.0
34+
version: 2.1.1
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.
@@ -45,7 +45,7 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this
4545
### Molecule (Optional)
4646

4747
* Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `3.3`.
48-
* Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html). _You will also need to install the Molecule Docker driver._
48+
* Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html). *You will also need to install the Molecule Docker driver.*
4949
* To run the Molecule tests, you must copy your NGINX App Protect license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/files/license/) folder.
5050

5151
You can alternatively add your NGINX App Protect repository certificate and key to the local environment. Run the following commands to export these files as base64-encoded variables and execute the Molecule tests:
@@ -150,4 +150,4 @@ You can find the Ansible NGINX Unit role to install NGINX Unit [here](https://gi
150150

151151
[Alessandro Fael Garcia](https://github.com/alessfg)
152152

153-
© [F5 Networks, Inc.](https://www.f5.com/) 2020 - 2021
153+
© [F5 Networks, Inc.](https://www.f5.com/) 2020 - 2022

vars/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@ nginx_app_protect_security_updates_default_signing_key_rsa_pub: https://cs.nginx
6161

6262
# Default NGINX Plus repositories
6363
nginx_plus_default_repository_alpine: "https://pkgs.nginx.com/plus/alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') }}/main"
64-
nginx_plus_default_repository_debian: "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg arch=amd64] https://pkgs.nginx.com/plus/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} nginx-plus"
64+
nginx_plus_default_repository_debian: "deb [arch=amd64 signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} nginx-plus"
6565
nginx_plus_default_repository_redhat: "https://pkgs.nginx.com/plus/centos/{{ ansible_distribution_major_version }}/$basearch/"
6666
nginx_plus_default_repository_amazon: "https://pkgs.nginx.com/plus/amzn{{ (ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('2', '') }}/$releasever/$basearch"
6767

6868
# Default NGINX App Protect WAF repositories
6969
nginx_app_protect_default_repository_alpine: "https://pkgs.nginx.com/app-protect/alpine/v{{ ansible_distribution_version | regex_search('^[0-9]+\\.[0-9]+') }}/main"
70-
nginx_app_protect_default_repository_debian: "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg arch=amd64] https://pkgs.nginx.com/app-protect/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus"
70+
nginx_app_protect_default_repository_debian: "deb [arch=amd64 signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/app-protect/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus"
7171
nginx_app_protect_default_repository_redhat: "https://pkgs.nginx.com/app-protect/centos/{{ ansible_distribution_major_version }}/$basearch/"
7272
nginx_app_protect_default_repository_amazon: "https://pkgs.nginx.com/app-protect/centos/7/$basearch/"
7373

7474
# Default NGINX App Protect WAF Security Updates repositories
7575
nginx_app_protect_security_updates_default_repository_alpine: "https://pkgs.nginx.com/app-protect-security-updates/alpine/v{{ ansible_distribution_version | regex_search('^[0-9]+\\.[0-9]+') }}/main"
76-
nginx_app_protect_security_updates_default_repository_debian: "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg arch=amd64] https://pkgs.nginx.com/app-protect-security-updates/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus"
76+
nginx_app_protect_security_updates_default_repository_debian: "deb [arch=amd64 signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/app-protect-security-updates/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus"
7777
nginx_app_protect_security_updates_default_repository_redhat: "https://pkgs.nginx.com/app-protect-security-updates/centos/{{ ansible_distribution_major_version }}/$basearch/"
7878
nginx_app_protect_security_updates_default_repository_amazon: "https://pkgs.nginx.com/app-protect-security-updates/centos/7/$basearch/"
7979

8080
# Default NGINX App Protect DoS repositories
81-
nginx_app_protect_dos_default_repository_debian: "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg arch=amd64] https://pkgs.nginx.com/app-protect-dos/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus"
81+
nginx_app_protect_dos_default_repository_debian: "deb [arch=amd64 signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/app-protect-dos/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus"
8282
nginx_app_protect_dos_default_repository_redhat: "https://pkgs.nginx.com/app-protect-dos/centos/{{ ansible_distribution_major_version }}/$basearch/"

0 commit comments

Comments
 (0)