From 9787b8d1f00f5972530ac7980f7099c8af5b98cc Mon Sep 17 00:00:00 2001 From: alessfg Date: Wed, 16 Feb 2022 15:10:00 +0100 Subject: [PATCH] Bump Ansible collections --- .github/workflows/requirements/requirements_ansible.yml | 4 ++-- CHANGELOG.md | 3 ++- README.md | 8 ++++---- vars/main.yml | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/requirements/requirements_ansible.yml b/.github/workflows/requirements/requirements_ansible.yml index 9fef21cf..243e34bf 100644 --- a/.github/workflows/requirements/requirements_ansible.yml +++ b/.github/workflows/requirements/requirements_ansible.yml @@ -1,8 +1,8 @@ --- collections: - name: community.general - version: 3.8.0 + version: 4.4.0 - name: ansible.posix version: 1.3.0 - name: community.docker - version: 2.0.0 + version: 2.1.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 202b5c32..af095705 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ ENHANCEMENTS: -Add signing keys to a unique NGINX keyring on Debian based systems. +* Add signing keys to a unique NGINX keyring on Debian based systems. +* Bump the Ansible `community.general` collection to `4.4.0` and `community.docker` collection to `2.1.1`. BUG FIXES: diff --git a/README.md b/README.md index dc4d7bf2..b15c70ac 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,11 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this --- collections: - name: community.general - version: 3.8.0 + version: 4.4.0 - name: ansible.posix version: 1.3.0 - name: community.docker # Only required if you plan to use Molecule (see below) - version: 2.0.0 + version: 2.1.1 ``` **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 ### Molecule (Optional) * Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `3.3`. -* 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._ +* 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.* * 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. 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 [Alessandro Fael Garcia](https://github.com/alessfg) -© [F5 Networks, Inc.](https://www.f5.com/) 2020 - 2021 +© [F5 Networks, Inc.](https://www.f5.com/) 2020 - 2022 diff --git a/vars/main.yml b/vars/main.yml index 33c47600..8c284b54 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -61,22 +61,22 @@ nginx_app_protect_security_updates_default_signing_key_rsa_pub: https://cs.nginx # Default NGINX Plus repositories nginx_plus_default_repository_alpine: "https://pkgs.nginx.com/plus/alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') }}/main" -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" +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" nginx_plus_default_repository_redhat: "https://pkgs.nginx.com/plus/centos/{{ ansible_distribution_major_version }}/$basearch/" nginx_plus_default_repository_amazon: "https://pkgs.nginx.com/plus/amzn{{ (ansible_facts['distribution_major_version'] is version('2', '==')) | ternary('2', '') }}/$releasever/$basearch" # Default NGINX App Protect WAF repositories nginx_app_protect_default_repository_alpine: "https://pkgs.nginx.com/app-protect/alpine/v{{ ansible_distribution_version | regex_search('^[0-9]+\\.[0-9]+') }}/main" -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" +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" nginx_app_protect_default_repository_redhat: "https://pkgs.nginx.com/app-protect/centos/{{ ansible_distribution_major_version }}/$basearch/" nginx_app_protect_default_repository_amazon: "https://pkgs.nginx.com/app-protect/centos/7/$basearch/" # Default NGINX App Protect WAF Security Updates repositories 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" -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" +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" nginx_app_protect_security_updates_default_repository_redhat: "https://pkgs.nginx.com/app-protect-security-updates/centos/{{ ansible_distribution_major_version }}/$basearch/" nginx_app_protect_security_updates_default_repository_amazon: "https://pkgs.nginx.com/app-protect-security-updates/centos/7/$basearch/" # Default NGINX App Protect DoS repositories -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" +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" nginx_app_protect_dos_default_repository_redhat: "https://pkgs.nginx.com/app-protect-dos/centos/{{ ansible_distribution_major_version }}/$basearch/"