Skip to content

Commit

Permalink
Update NGINX Ansible collection to v0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alessfg committed Apr 7, 2022
1 parent 3b8b3a6 commit 8275e7b
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Describe the use case and detail of the change. If this PR addresses an issue on

Before creating a PR, run through this checklist and mark each as complete.

- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/ansible-collection-nginx/blob/main/CONTRIBUTING.md) document
- [ ] I have updated any relevant documentation (`README.md` and `CHANGELOG.md`)
- [ ] I have read the [`CONTRIBUTING`](https://github.com/nginxinc/ansible-collection-nginx/blob/main/CONTRIBUTING.md) document
- [ ] I have updated any relevant documentation ([`README`](https://github.com/nginxinc/ansible-collection-nginx/blob/main/README.md) and [`CHANGELOG`](https://github.com/nginxinc/ansible-collection-nginx/blob/main/CHANGELOG.md))
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
*.key
*~
\#*
!molecule.crt
!molecule.key

# OS Specific #
###############
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# CHANGELOG

## 0.6.0 (April 7, 2022)

Update `nginx` role to `0.23.1`, `nginx_config` role to `0.5.1`, and `nginx_app_protect` role to `0.8.0`. Check each role's respective CHANGELOG to see what's changed since the latest NGINX collection release:

* Ansible NGINX role's [changelog](https://github.com/nginxinc/ansible-role-nginx/blob/0.23.1/CHANGELOG.md)
* Ansible NGINX config role's [changelog](https://github.com/nginxinc/ansible-role-nginx-config/blob/0.5.1/CHANGELOG.md)
* Ansible NGINX App Protect role's [changelog](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/0.8.0/CHANGELOG.md)

## 0.5.0 (February 17, 2022)

Update `nginx` role to `0.23.0`, `nginx_config` role to `0.5.0`, and `nginx_app_protect` role to `0.7.1`. Check each role's respective CHANGELOG to see what's changed since the latest NGINX collection release:

* Ansible NGINX role's [changelog](https://github.com/nginxinc/ansible-role-nginx/blob/0.23.0/CHANGELOG.md)
* Ansible NGINX config role's [changelog](https://github.com/nginxinc/ansible-role-nginx-config/blob/0.5.0/CHANGELOG.md)
* Ansible NGINX App Protect role's [changelog](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/0.7.1/CHANGELOG.md)

## 0.4.0 (October 28, 2021)

Update `nginx` role to `0.21.3`, `nginx_config` role to `0.4.2`, and `nginx_app_protect` role to `0.7.0`. Check each role's respective CHANGELOG to see what's changed since the latest NGINX collection release:
Expand Down
4 changes: 1 addition & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
<https://www.contributor-covenant.org/faq>
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Follow our [Installation Guide](https://github.com/nginxinc/ansible-collection-n

* The NGINX Ansible collection is written in `yaml` and supports NGINX Open Source, NGINX Plus and NGINX App Protect.
* The project follows the standard [Ansible collection directory structure](https://docs.ansible.com/ansible/latest/dev_guide/developing_collections.html):
* The main code is found at `roles/` (do note that all roles are Git submodules).
* Sample playbooks and instructions can be found at `docs/`.
* The main code is found in [`roles/`](https://github.com/nginxinc/ansible-collection-nginx/blob/main/roles/) directory (do note that all roles are Git submodules).
* Sample playbooks and instructions can be found in the [`playbooks/`](https://github.com/nginxinc/ansible-collection-nginx/blob/main/playbooks/) directory.

## Contributing

Expand All @@ -44,7 +44,7 @@ To suggest an enhancement, please create an issue on GitHub with the label `enha

### Open a Pull Request

* Fork the repo, create a branch, submit a PR when your changes are **tested** and ready for review.
* Fork the repo, create a branch, implement your changes, submit a PR when your changes are **tested** and ready for review.
* Fill in [our pull request template](https://github.com/nginxinc/ansible-collection-nginx/blob/main/.github/PULL_REQUEST_TEMPLATE.md).

Note: if you'd like to implement a new feature, please consider creating a feature request issue first to start a discussion about the feature.
Expand All @@ -53,8 +53,8 @@ Note: if you'd like to implement a new feature, please consider creating a featu

### Ansible Guidelines

* Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
* Run `molecule test --all` on your code to catch any other issues.
* Run `molecule lint` in each role directory to automatically resolve a lot of `yaml` and Ansible style issues.
* Run `molecule test --all` in each role directory to catch any other issues.
* Follow these guides on some good practices for Ansible:
* <https://www.ansible.com/blog/ansible-best-practices-essentials>
* <https://docs.ansible.com/ansible/latest/user_guide/playbooks_best_practices.html>
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ The Ansible NGINX collection includes a variety of NGINX Ansible roles to help a

## Included Content

The current stable release (`0.5.0`) of the Ansible NGINX collection includes the following roles:
The current stable release (`0.6.0`) of the Ansible NGINX collection includes the following roles:

| Name | Description | Version |
| ---- | ----------- | ------- |
| [nginxinc.nginx](https://github.com/nginxinc/ansible-role-nginx) | Install NGINX | 0.23.0 |
| [nginxinc.nginx_config](https://github.com/nginxinc/ansible-role-nginx-config) | Configure NGINX | 0.5.0 |
| [nginxinc.nginx_app_protect](https://github.com/nginxinc/ansible-role-nginx-app-protect) | Install and configure NGINX App Protect | 0.7.1 |
| [nginxinc.nginx](https://github.com/nginxinc/ansible-role-nginx) | Install NGINX | 0.23.1 |
| [nginxinc.nginx_config](https://github.com/nginxinc/ansible-role-nginx-config) | Configure NGINX | 0.5.1 |
| [nginxinc.nginx_app_protect](https://github.com/nginxinc/ansible-role-nginx-app-protect) | Install and configure NGINX App Protect | 0.8.0 |

## Requirements

Expand All @@ -38,11 +38,11 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this
---
collections:
- name: community.general
version: 4.4.0
version: 4.6.0
- name: ansible.posix
version: 1.3.0
- name: community.docker # Only required if you plan to use Molecule (see below)
version: 2.1.1
version: 2.3.0
```
**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.
Expand Down Expand Up @@ -81,7 +81,7 @@ You can also include the collection in a `requirements.yml` file and install it
---
collections:
- name: nginxinc.nginx_core
version: 0.5.0
version: 0.6.0
```

### Git
Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace: nginxinc
name: nginx_core
description: Install and configure NGINX and NGINX App Protect using Ansible
version: 0.5.0
version: 0.6.0
readme: README.md
license_file: LICENSE
authors:
Expand Down
2 changes: 1 addition & 1 deletion playbooks/deploy-nginx-app-protect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX App Protect
include_role:
ansible.builtin.include_role:
name: nginx_app_protect
vars:
nginx_app_protect_license:
Expand Down
6 changes: 3 additions & 3 deletions playbooks/deploy-nginx-plus-app-protect-web-server-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX Plus
include_role:
ansible.builtin.include_role:
name: nginx
vars:
nginx_type: plus
Expand All @@ -14,7 +14,7 @@
nginx_remove_license: false

- name: Install NGINX App Protect WAF/DoS
include_role:
ansible.builtin.include_role:
name: nginx_app_protect
vars:
nginx_app_protect_waf_enable: true
Expand All @@ -25,7 +25,7 @@
nginx_app_protect_remove_license: false

- name: Configure NGINX
include_role:
ansible.builtin.include_role:
name: nginx_config
vars:
nginx_config_modules:
Expand Down
4 changes: 2 additions & 2 deletions playbooks/deploy-nginx-plus-app-protect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX Plus
include_role:
ansible.builtin.include_role:
name: nginx
vars:
nginx_type: plus
Expand All @@ -14,7 +14,7 @@
nginx_remove_license: false

- name: Install NGINX App Protect WAF
include_role:
ansible.builtin.include_role:
name: nginx_app_protect
vars:
nginx_app_protect_setup_license: false
Expand Down
2 changes: 1 addition & 1 deletion playbooks/deploy-nginx-plus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX Plus
include_role:
ansible.builtin.include_role:
name: nginx
vars:
nginx_type: plus
Expand Down
4 changes: 2 additions & 2 deletions playbooks/deploy-nginx-web-server-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX
include_role:
ansible.builtin.include_role:
name: nginx

- name: Configure NGINX
include_role:
ansible.builtin.include_role:
name: nginx_config
vars:
nginx_config_http_template_enable: true
Expand Down
4 changes: 2 additions & 2 deletions playbooks/deploy-nginx-web-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX
include_role:
ansible.builtin.include_role:
name: nginx

- name: Configure NGINX
include_role:
ansible.builtin.include_role:
name: nginx_config
vars:
nginx_config_http_template_enable: true
Expand Down
2 changes: 1 addition & 1 deletion playbooks/deploy-nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
- nginxinc.nginx_core
tasks:
- name: Install NGINX
include_role:
ansible.builtin.include_role:
name: nginx
2 changes: 1 addition & 1 deletion roles/nginx
Submodule nginx updated 73 files
+13 −6 .github/dependabot.yml
+1 −1 .github/pull_request_template.md
+3 −2 .github/workflows/galaxy.yml
+2 −2 .github/workflows/molecule.yml
+1 −0 .github/workflows/release-drafter.yml
+2 −2 .github/workflows/requirements/requirements_ansible.yml
+1 −1 .github/workflows/requirements/requirements_galaxy.txt
+3 −3 .github/workflows/requirements/requirements_molecule.txt
+18 −0 CHANGELOG.md
+2 −2 README.md
+13 −13 defaults/main/main.yml
+2 −1 defaults/main/selinux.yml
+3 −1 defaults/main/systemd.yml
+7 −6 handlers/main.yml
+4 −0 meta/main.yml
+1 −1 molecule/common/Dockerfile.j2
+7 −17 molecule/default/converge.yml
+14 −0 molecule/default/molecule.yml
+4 −4 molecule/default/verify.yml
+5 −5 molecule/downgrade/converge.yml
+21 −0 molecule/downgrade/molecule.yml
+7 −14 molecule/downgrade/prepare.yml
+10 −10 molecule/downgrade/verify.yml
+1 −11 molecule/module/converge.yml
+14 −0 molecule/module/molecule.yml
+3 −3 molecule/module/verify.yml
+1 −1 molecule/plus/converge.yml
+14 −0 molecule/plus/molecule.yml
+2 −2 molecule/plus/prepare.yml
+3 −3 molecule/plus/verify.yml
+1 −3 molecule/source/converge.yml
+14 −0 molecule/source/molecule.yml
+2 −2 molecule/source/verify.yml
+1 −1 molecule/uninstall/converge.yml
+14 −0 molecule/uninstall/molecule.yml
+1 −1 molecule/uninstall/prepare.yml
+1 −1 molecule/uninstall/verify.yml
+2 −2 molecule/uninstall_plus/converge.yml
+14 −0 molecule/uninstall_plus/molecule.yml
+3 −3 molecule/uninstall_plus/prepare.yml
+1 −1 molecule/uninstall_plus/verify.yml
+1 −1 molecule/upgrade/converge.yml
+14 −0 molecule/upgrade/molecule.yml
+5 −12 molecule/upgrade/prepare.yml
+6 −6 molecule/upgrade/verify.yml
+4 −4 tasks/amplify/install-amplify.yml
+1 −1 tasks/amplify/setup-debian.yml
+1 −1 tasks/amplify/setup-redhat.yml
+2 −2 tasks/config/debug-output.yml
+4 −4 tasks/config/modify-systemd.yml
+6 −6 tasks/config/setup-logrotate.yml
+5 −5 tasks/keys/setup-keys.yml
+14 −14 tasks/main.yml
+19 −3 tasks/modules/install-modules.yml
+2 −2 tasks/opensource/install-alpine.yml
+10 −10 tasks/opensource/install-bsd.yml
+3 −3 tasks/opensource/install-debian.yml
+4 −4 tasks/opensource/install-oss.yml
+2 −2 tasks/opensource/install-redhat.yml
+57 −55 tasks/opensource/install-source.yml
+2 −2 tasks/opensource/install-suse.yml
+2 −2 tasks/plus/install-alpine.yml
+3 −3 tasks/plus/install-debian.yml
+3 −3 tasks/plus/install-freebsd.yml
+2 −2 tasks/plus/install-redhat.yml
+2 −2 tasks/plus/install-suse.yml
+4 −4 tasks/plus/remove-license.yml
+6 −6 tasks/plus/setup-license.yml
+6 −6 tasks/prerequisites/install-dependencies.yml
+3 −3 tasks/prerequisites/prerequisites.yml
+18 −31 tasks/prerequisites/setup-selinux.yml
+0 −2 templates/selinux/nginx-plus-module.te.j2
+4 −1 templates/services/nginx.service.override.conf.j2
2 changes: 1 addition & 1 deletion roles/nginx_app_protect
Submodule nginx_app_protect updated 57 files
+13 −6 .github/dependabot.yml
+1 −1 .github/pull_request_template.md
+3 −2 .github/workflows/galaxy.yml
+6 −3 .github/workflows/molecule.yml
+1 −0 .github/workflows/release-drafter.yml
+2 −2 .github/workflows/requirements/requirements_ansible.yml
+1 −1 .github/workflows/requirements/requirements_galaxy.txt
+3 −3 .github/workflows/requirements/requirements_molecule.txt
+29 −0 CHANGELOG.md
+6 −2 README.md
+68 −31 defaults/main.yml
+10 −10 handlers/main.yml
+5 −0 meta/main.yml
+4 −5 molecule/advanced/converge.yml
+4 −4 molecule/advanced/molecule.yml
+4 −4 molecule/advanced/prepare.yml
+4 −5 molecule/advanced/verify.yml
+0 −0 molecule/common/Dockerfile.j2
+32 −0 molecule/common/cleanup.yml
+4 −4 molecule/common/prepare.yml
+21 −4 molecule/default/converge.yml
+1 −1 molecule/default/files/test-security-policy.json
+21 −5 molecule/default/molecule.yml
+9 −10 molecule/default/verify.yml
+19 −1 molecule/dos/converge.yml
+20 −4 molecule/dos/molecule.yml
+0 −18 molecule/dos/prepare.yml
+3 −5 molecule/dos/verify.yml
+7 −11 molecule/specific-version/converge.yml
+12 −5 molecule/specific-version/molecule.yml
+0 −18 molecule/specific-version/prepare.yml
+10 −15 molecule/specific-version/verify.yml
+13 −0 molecule/uninstall/converge.yml
+56 −0 molecule/uninstall/molecule.yml
+58 −0 molecule/uninstall/prepare.yml
+83 −0 molecule/uninstall/verify.yml
+4 −4 tasks/common/config/configure-app-protect.yml
+4 −4 tasks/common/install/remove-license.yml
+3 −3 tasks/common/install/service-modification.yml
+14 −40 tasks/common/install/setup-license.yml
+8 −21 tasks/common/keys/setup-keys.yml
+59 −29 tasks/common/prerequisites/install-dependencies.yml
+19 −0 tasks/common/prerequisites/prerequisites.yml
+84 −0 tasks/common/prerequisites/setup-selinux.yml
+14 −6 tasks/common/prerequisites/validate-supported-os.yml
+0 −6 tasks/dos/install-app-protect-dos.yml
+17 −15 tasks/dos/install-debian.yml
+13 −10 tasks/dos/install-redhat.yml
+54 −69 tasks/main.yml
+0 −57 tasks/waf/install-alpine.yml
+0 −6 tasks/waf/install-app-protect-waf.yml
+44 −42 tasks/waf/install-debian.yml
+36 −34 tasks/waf/install-redhat.yml
+0 −3 templates/nginx.service.override.conf.j2
+21 −0 templates/selinux/nginx-app-protect-module.te.j2
+7 −0 templates/services/nginx.service.override.conf.j2
+39 −31 vars/main.yml

0 comments on commit 8275e7b

Please sign in to comment.