From bbcaf7ae9acf4398133d801af9d794e73415252b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 20:04:29 +0000 Subject: [PATCH 1/5] Bump ansible-lint from 5.3.2 to 5.4.0 in /.github/workflows/requirements Bumps [ansible-lint](https://github.com/ansible-community/ansible-lint) from 5.3.2 to 5.4.0. - [Release notes](https://github.com/ansible-community/ansible-lint/releases) - [Commits](https://github.com/ansible-community/ansible-lint/compare/v5.3.2...v5.4.0) --- updated-dependencies: - dependency-name: ansible-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/requirements/requirements_molecule.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements/requirements_molecule.txt b/.github/workflows/requirements/requirements_molecule.txt index 707b32966..72125c543 100644 --- a/.github/workflows/requirements/requirements_molecule.txt +++ b/.github/workflows/requirements/requirements_molecule.txt @@ -1,6 +1,6 @@ ansible-core==2.12.2 jinja2==3.0.3 -ansible-lint==5.3.2 +ansible-lint==5.4.0 yamllint==1.26.3 molecule[docker]==3.6.0 docker==5.0.3 From 34542adab090c8f04f54d5b0b1d2b798cd1e2b16 Mon Sep 17 00:00:00 2001 From: alessfg Date: Tue, 15 Feb 2022 14:43:42 +0100 Subject: [PATCH 2/5] Fix Ansible lint warnings And update source install package versions while at it --- molecule/source/converge.yml | 6 +++--- tasks/opensource/install-source.yml | 3 +++ vars/main.yml | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/molecule/source/converge.yml b/molecule/source/converge.yml index 327b2d86c..54ca81218 100644 --- a/molecule/source/converge.yml +++ b/molecule/source/converge.yml @@ -12,6 +12,6 @@ nginx_branch: stable nginx_static_modules: ['http_ssl_module'] nginx_install_source_build_tools: true - nginx_install_source_pcre: true - nginx_install_source_openssl: true - nginx_install_source_zlib: true + nginx_install_source_pcre: false + nginx_install_source_openssl: false + nginx_install_source_zlib: false diff --git a/tasks/opensource/install-source.yml b/tasks/opensource/install-source.yml index a50d76873..98fb30e40 100644 --- a/tasks/opensource/install-source.yml +++ b/tasks/opensource/install-source.yml @@ -143,6 +143,7 @@ command: ./configure args: chdir: "/tmp/{{ pcre_version }}" + creates: "/tmp/makefile" - name: Make PCRE dependency make: @@ -201,6 +202,7 @@ command: ./configure args: chdir: "/tmp/{{ zlib_version }}" + creates: "/tmp/makefile" - name: Make ZLib dependency make: @@ -259,6 +261,7 @@ command: ./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl shared zlib args: chdir: "/tmp/{{ openssl_version }}" + creates: "/tmp/makefile" - name: Make OpenSSL dependency make: diff --git a/vars/main.yml b/vars/main.yml index 9919e9bec..8b7ced459 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -26,8 +26,8 @@ nginx_plus_distributions: [ ] # Default NGINX signing key -nginx_default_signing_key_rsa_pub: https://nginx.org/keys/nginx_signing.rsa.pub nginx_default_signing_key_pgp: https://nginx.org/keys/nginx_signing.key +nginx_default_signing_key_rsa_pub: https://nginx.org/keys/nginx_signing.rsa.pub # Default NGINX Open Source repositories nginx_default_repository_alpine: "@nginx http://nginx.org/packages/{{ (nginx_branch == 'mainline') | ternary('mainline/', '') }}\ @@ -81,9 +81,9 @@ nginx_freebsd_dependencies: [ ] # Default locations and versions when 'nginx_install_from' is set to 'source' -pcre_version: pcre-8.44 +pcre_version: pcre-8.45 zlib_version: zlib-1.2.11 -openssl_version: openssl-1.1.1g +openssl_version: openssl-1.1.1m # Supported NGINX Open Source dynamic modules nginx_modules_list: [ From db3c98d576e4c2c22240dd8b79222faaf6d12eb6 Mon Sep 17 00:00:00 2001 From: alessfg Date: Tue, 15 Feb 2022 15:54:13 +0100 Subject: [PATCH 3/5] Update install-source.yml --- tasks/opensource/install-source.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/opensource/install-source.yml b/tasks/opensource/install-source.yml index 98fb30e40..4ce008a89 100644 --- a/tasks/opensource/install-source.yml +++ b/tasks/opensource/install-source.yml @@ -338,6 +338,7 @@ {{ nginx_install_source_static_modules | default('') }} args: chdir: "/tmp/{{ nginx_version }}" + creates: "/tmp/makefile" register: nginx_configure - name: Make NGINX From 5c0a5120109f112fe129d1f3c7a176cff6b66b8d Mon Sep 17 00:00:00 2001 From: alessfg Date: Tue, 15 Feb 2022 16:37:49 +0100 Subject: [PATCH 4/5] Remove deprecated parameter --- CHANGELOG.md | 3 ++- molecule/plus/converge.yml | 1 - vars/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9eacc3b9..ac4b66586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ BREAKING CHANGES: -CentOS 8 has reached EoL and has thus been removed from the list of supported platforms. +* CentOS 8 has reached EoL and has thus been removed from the list of supported platforms. +* The NGINX Plus `cookie-flag` module is no longer supported as of R26 and has been removed. FEATURES: diff --git a/molecule/plus/converge.yml b/molecule/plus/converge.yml index c96f91be5..3b70807f1 100644 --- a/molecule/plus/converge.yml +++ b/molecule/plus/converge.yml @@ -14,7 +14,6 @@ nginx_modules: - auth-spnego - brotli - - cookie-flag - encrypted-session - geoip - "{{ ansible_facts['distribution'] == 'Amazon' | ternary('', 'geoip2') }}" diff --git a/vars/main.yml b/vars/main.yml index 8b7ced459..bf706d237 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -92,6 +92,6 @@ nginx_modules_list: [ # Supported NGINX Plus dynamic modules nginx_plus_modules_list: [ - 'auth-spnego', 'brotli', 'cookie-flag', 'encrypted-session', 'geoip', 'geoip2', 'headers-more', 'image-filter', + 'auth-spnego', 'brotli', 'encrypted-session', 'geoip', 'geoip2', 'headers-more', 'image-filter', 'lua', 'njs', 'opentracing', 'passenger', 'perl', 'prometheus', 'rtmp', 'subs-filter', 'xslt', ] From d1702fad187df37ba239e4e4cffd06683985e000 Mon Sep 17 00:00:00 2001 From: alessfg Date: Tue, 15 Feb 2022 21:12:30 +0100 Subject: [PATCH 5/5] Update converge.yml --- molecule/source/converge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/molecule/source/converge.yml b/molecule/source/converge.yml index 54ca81218..327b2d86c 100644 --- a/molecule/source/converge.yml +++ b/molecule/source/converge.yml @@ -12,6 +12,6 @@ nginx_branch: stable nginx_static_modules: ['http_ssl_module'] nginx_install_source_build_tools: true - nginx_install_source_pcre: false - nginx_install_source_openssl: false - nginx_install_source_zlib: false + nginx_install_source_pcre: true + nginx_install_source_openssl: true + nginx_install_source_zlib: true