Skip to content

Commit 8275e7b

Browse files
committed
Update NGINX Ansible collection to v0.6.0
1 parent 3b8b3a6 commit 8275e7b

17 files changed

+49
-33
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Describe the use case and detail of the change. If this PR addresses an issue on
66

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

9-
- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/ansible-collection-nginx/blob/main/CONTRIBUTING.md) document
10-
- [ ] I have updated any relevant documentation (`README.md` and `CHANGELOG.md`)
9+
- [ ] I have read the [`CONTRIBUTING`](https://github.com/nginxinc/ansible-collection-nginx/blob/main/CONTRIBUTING.md) document
10+
- [ ] 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))

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
*.key
55
*~
66
\#*
7+
!molecule.crt
8+
!molecule.key
79

810
# OS Specific #
911
###############

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# CHANGELOG
22

3+
## 0.6.0 (April 7, 2022)
4+
5+
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:
6+
7+
* Ansible NGINX role's [changelog](https://github.com/nginxinc/ansible-role-nginx/blob/0.23.1/CHANGELOG.md)
8+
* Ansible NGINX config role's [changelog](https://github.com/nginxinc/ansible-role-nginx-config/blob/0.5.1/CHANGELOG.md)
9+
* Ansible NGINX App Protect role's [changelog](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/0.8.0/CHANGELOG.md)
10+
11+
## 0.5.0 (February 17, 2022)
12+
13+
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:
14+
15+
* Ansible NGINX role's [changelog](https://github.com/nginxinc/ansible-role-nginx/blob/0.23.0/CHANGELOG.md)
16+
* Ansible NGINX config role's [changelog](https://github.com/nginxinc/ansible-role-nginx-config/blob/0.5.0/CHANGELOG.md)
17+
* Ansible NGINX App Protect role's [changelog](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/0.7.1/CHANGELOG.md)
18+
319
## 0.4.0 (October 28, 2021)
420

521
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:

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ members of the project's leadership.
6767

6868
## Attribution
6969

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

73-
[homepage]: https://www.contributor-covenant.org
74-
7573
For answers to common questions about this code of conduct, see
7674
<https://www.contributor-covenant.org/faq>

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Follow our [Installation Guide](https://github.com/nginxinc/ansible-collection-n
2929

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

3535
## Contributing
3636

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

4545
### Open a Pull Request
4646

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

5050
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.
@@ -53,8 +53,8 @@ Note: if you'd like to implement a new feature, please consider creating a featu
5353

5454
### Ansible Guidelines
5555

56-
* Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
57-
* Run `molecule test --all` on your code to catch any other issues.
56+
* Run `molecule lint` in each role directory to automatically resolve a lot of `yaml` and Ansible style issues.
57+
* Run `molecule test --all` in each role directory to catch any other issues.
5858
* Follow these guides on some good practices for Ansible:
5959
* <https://www.ansible.com/blog/ansible-best-practices-essentials>
6060
* <https://docs.ansible.com/ansible/latest/user_guide/playbooks_best_practices.html>

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ The Ansible NGINX collection includes a variety of NGINX Ansible roles to help a
1111

1212
## Included Content
1313

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

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

2222
## Requirements
2323

@@ -38,11 +38,11 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this
3838
---
3939
collections:
4040
- name: community.general
41-
version: 4.4.0
41+
version: 4.6.0
4242
- name: ansible.posix
4343
version: 1.3.0
4444
- name: community.docker # Only required if you plan to use Molecule (see below)
45-
version: 2.1.1
45+
version: 2.3.0
4646
```
4747
4848
**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.
@@ -81,7 +81,7 @@ You can also include the collection in a `requirements.yml` file and install it
8181
---
8282
collections:
8383
- name: nginxinc.nginx_core
84-
version: 0.5.0
84+
version: 0.6.0
8585
```
8686

8787
### Git

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
namespace: nginxinc
33
name: nginx_core
44
description: Install and configure NGINX and NGINX App Protect using Ansible
5-
version: 0.5.0
5+
version: 0.6.0
66
readme: README.md
77
license_file: LICENSE
88
authors:

playbooks/deploy-nginx-app-protect.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- nginxinc.nginx_core
55
tasks:
66
- name: Install NGINX App Protect
7-
include_role:
7+
ansible.builtin.include_role:
88
name: nginx_app_protect
99
vars:
1010
nginx_app_protect_license:

playbooks/deploy-nginx-plus-app-protect-web-server-proxy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- nginxinc.nginx_core
55
tasks:
66
- name: Install NGINX Plus
7-
include_role:
7+
ansible.builtin.include_role:
88
name: nginx
99
vars:
1010
nginx_type: plus
@@ -14,7 +14,7 @@
1414
nginx_remove_license: false
1515

1616
- name: Install NGINX App Protect WAF/DoS
17-
include_role:
17+
ansible.builtin.include_role:
1818
name: nginx_app_protect
1919
vars:
2020
nginx_app_protect_waf_enable: true
@@ -25,7 +25,7 @@
2525
nginx_app_protect_remove_license: false
2626

2727
- name: Configure NGINX
28-
include_role:
28+
ansible.builtin.include_role:
2929
name: nginx_config
3030
vars:
3131
nginx_config_modules:

playbooks/deploy-nginx-plus-app-protect.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
- nginxinc.nginx_core
55
tasks:
66
- name: Install NGINX Plus
7-
include_role:
7+
ansible.builtin.include_role:
88
name: nginx
99
vars:
1010
nginx_type: plus
@@ -14,7 +14,7 @@
1414
nginx_remove_license: false
1515

1616
- name: Install NGINX App Protect WAF
17-
include_role:
17+
ansible.builtin.include_role:
1818
name: nginx_app_protect
1919
vars:
2020
nginx_app_protect_setup_license: false

0 commit comments

Comments
 (0)