Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/requirements/requirements_molecule.txt
Original file line number Diff line number Diff line change
@@ -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.1
docker==5.0.3
4 changes: 4 additions & 0 deletions tasks/opensource/install-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
command: ./configure
args:
chdir: "/tmp/{{ pcre_version }}"
creates: "/tmp/makefile"

- name: Make PCRE dependency
make:
Expand Down Expand Up @@ -201,6 +202,7 @@
command: ./configure
args:
chdir: "/tmp/{{ zlib_version }}"
creates: "/tmp/makefile"

- name: Make ZLib dependency
make:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -335,6 +338,7 @@
{{ nginx_install_source_static_modules | default('') }}
args:
chdir: "/tmp/{{ nginx_version }}"
creates: "/tmp/makefile"
register: nginx_configure

- name: Make NGINX
Expand Down
6 changes: 3 additions & 3 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/', '') }}\
Expand Down Expand Up @@ -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: [
Expand Down