Skip to content

Commit c60afdc

Browse files
committed
Prepare 0.6.0 release
1 parent bf8b33f commit c60afdc

9 files changed

+136
-73
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
6-
assignees: ''
4+
title: ""
5+
labels: ""
6+
assignees: ""
77
---
8+
89
### Describe the bug
910

1011
A clear and concise description of what the bug is.
@@ -13,8 +14,8 @@ A clear and concise description of what the bug is.
1314

1415
Steps to reproduce the behavior:
1516

16-
1. Deploy NGINX Config role using playbook.yml
17-
2. View output/logs/configuration on '...'
17+
1. Deploy the Ansible NGINX configuration role using `playbook.yml`
18+
2. View output/logs/configuration on ...
1819
3. See error
1920

2021
### Expected behavior
@@ -23,7 +24,7 @@ A clear and concise description of what you expected to happen.
2324

2425
### Your environment
2526

26-
- Version of the NGINX Config role or specific commit
27+
- Version of the Ansible NGINX configuration role or specific commit
2728
- Version of Ansible
2829
- Version of Jinja2 (if you are using any templating capability)
2930
- Target deployment platform

.github/ISSUE_TEMPLATE/feature_request.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
5-
labels: ''
6-
assignees: ''
4+
title: ""
5+
labels: ""
6+
assignees: ""
77
---
8+
89
### Is your feature request related to a problem? Please describe
910

1011
A clear and concise description of what the problem is. Ex. I'm always frustrated when ...

.github/SECURITY.md

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
# Security Policy
22

3-
## Supported Versions
3+
## Versions
44

5-
This role mainly consists of Ansible tasks. Ansible applies security fixes to the most recent three releases. Please find more information in [the Ansible docs](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#release-status).
5+
### Latest Versions
6+
7+
We advise users to run or update to the most recent release of the Ansible NGINX configuration role. Older versions of this role may not have all enhancements and/or bug fixes applied to them.
8+
9+
### Supported Versions
10+
11+
This codebase mainly consists of an Ansible role, sprinkled with a dose of GitHub actions for CI/CD. Ansible applies security fixes to the most recent three releases. Please find more information in [the Ansible docs](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#release-status).
612

713
## Reporting a Vulnerability
814

9-
If you find a security vulnerability that affects Ansible, we encourage you to report it according to the [Ansible guidelines](https://docs.ansible.com/ansible/devel/community/reporting_bugs_and_features.html#reporting-a-bug).
15+
### Ansible
16+
17+
If you find a security vulnerability that affects Ansible directly, we encourage you to report it according to the [Ansible guidelines](https://docs.ansible.com/ansible/devel/community/reporting_bugs_and_features.html#reporting-a-bug).
18+
19+
### Codebase
20+
21+
If you find a security vulnerability that affects the codebase, we encourage you to report it to the F5 Security Incident Response Team (F5 SIRT):
22+
23+
- If you’re an F5 customer with an active support contract, please contact [F5 Technical Support](https://www.f5.com/services/support).
24+
- If you aren’t an F5 customer, please report any potential or current instances of security vulnerabilities to the F5 SIRT at <[email protected]>.
25+
26+
For more information visit [https://www.f5.com/services/support/report-a-vulnerability](https://www.f5.com/services/support/report-a-vulnerability)

.github/release-drafter.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ template: |
9292
9393
## Install & Upgrade
9494
95-
* To install the Ansible NGINX config role on a fresh environment, run `ansible-galaxy install nginxinc.nginx_config`.
96-
* To upgrade the Ansible NGINX config role to the latest release, run `ansible-galaxy install -f nginxinc.nginx_config`.
97-
* To install or upgrade to this specific Ansible NGINX config role release ($RESOLVED_VERSION), run `ansible-galaxy install -f nginxinc.nginx_config,v$RESOLVED_VERSION`.
95+
- To install the Ansible NGINX config role on a fresh environment, run `ansible-galaxy install nginxinc.nginx_config`.
96+
- To upgrade the Ansible NGINX config role to the latest release, run `ansible-galaxy install -f nginxinc.nginx_config`.
97+
- To install or upgrade to this specific Ansible NGINX config role release ($RESOLVED_VERSION), run `ansible-galaxy install -f nginxinc.nginx_config,v$RESOLVED_VERSION`.
9898
9999
## Resources
100100
101-
* Functional configuration examples (check `converge.yml` under each `molecule` scenario) -- [github.com/nginxinc/ansible-role-nginx-config/tree/$RESOLVED_VERSION/molecule](https://github.com/nginxinc/ansible-role-nginx-config/tree/$RESOLVED_VERSION/molecule).
102-
* Ansible Galaxy repository -- [galaxy.ansible.com/nginxinc/nginx_config](https://galaxy.ansible.com/nginxinc/nginx_config).
103-
* NGINX Ansible role & collection introductory blog -- [nginx.com/blog/announcing-nginx-core-collection-ansible](https://www.nginx.com/blog/announcing-nginx-core-collection-ansible).
104-
* NGINX: Better with Ansible demo -- [github.com/alessfg/nginx-ansible-demo](https://github.com/alessfg/nginx-ansible-demo).
101+
- Functional configuration examples (check `converge.yml` under each `molecule` scenario) -- [github.com/nginxinc/ansible-role-nginx-config/tree/$RESOLVED_VERSION/molecule](https://github.com/nginxinc/ansible-role-nginx-config/tree/$RESOLVED_VERSION/molecule).
102+
- Ansible Galaxy repository -- [galaxy.ansible.com/nginxinc/nginx_config](https://galaxy.ansible.com/nginxinc/nginx_config).
103+
- NGINX Ansible role & collection introductory blog -- [nginx.com/blog/announcing-nginx-core-collection-ansible](https://www.nginx.com/blog/announcing-nginx-core-collection-ansible).
104+
- NGINX: Better with Ansible demo -- [github.com/alessfg/nginx-ansible-demo](https://github.com/alessfg/nginx-ansible-demo).

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 0.6.0 (Unreleased)
3+
## 0.6.0 (January 29, 2023)
44

55
ENHANCEMENTS:
66

CODE_OF_CONDUCT.md

+10-13
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,19 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
2222

2323
Examples of unacceptable behavior by participants include:
2424

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
25+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
26+
- Trolling, insulting/derogatory comments, and personal or political attacks
27+
- Public or private harassment
28+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
29+
- Other conduct which could reasonably be considered inappropriate in a professional setting
3330

3431
## Our Responsibilities
3532

CONTRIBUTING.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ The following is a set of guidelines for contributing to the NGINX config Ansibl
1212

1313
[Code Guidelines](#code-guidelines)
1414

15-
* [Git Guidelines](#git-guidelines)
16-
* [Ansible Guidelines](#ansible-guidelines)
15+
- [Git Guidelines](#git-guidelines)
16+
- [Ansible Guidelines](#ansible-guidelines)
1717

1818
[Code of Conduct](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/CODE_OF_CONDUCT.md)
1919

@@ -27,14 +27,14 @@ Follow our [Installation Guide](https://github.com/nginxinc/ansible-role-nginx-c
2727

2828
### Project Structure
2929

30-
* The NGINX config Ansible role is written in `yaml` and supports NGINX Open Source and NGINX Plus.
31-
* The project follows the standard [Ansible role directory structure](https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html):
32-
* The main code is found in [`tasks/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/tasks/).
33-
* Variables can be found in [`defaults/main/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/defaults/main/).
34-
* "Constant" variables can be found in [`vars/main.yml`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/vars/main.yml).
35-
* Configuration templates for NGINX can be found in [`templates/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/templates/).
36-
* [Molecule](https://molecule.readthedocs.io/) tests can be found in [`molecule/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/molecule/).
37-
* CI/CD is done via GitHub actions using the workflow files found in [`.github/workflows/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/.github/workflows/).
30+
- The NGINX config Ansible role is written in `yaml` and supports NGINX Open Source and NGINX Plus.
31+
- The project follows the standard [Ansible role directory structure](https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html):
32+
- The main code is found in [`tasks/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/tasks/).
33+
- Variables can be found in [`defaults/main/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/defaults/main/).
34+
- "Constant" variables can be found in [`vars/main.yml`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/vars/main.yml).
35+
- Configuration templates for NGINX can be found in [`templates/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/templates/).
36+
- [Molecule](https://molecule.readthedocs.io/) tests can be found in [`molecule/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/molecule/).
37+
- CI/CD is done via GitHub actions using the workflow files found in [`.github/workflows/`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/.github/workflows/).
3838

3939
## Contributing
4040

@@ -48,27 +48,27 @@ To suggest a feature or enhancement, please create an issue on GitHub with the l
4848

4949
### Open a Pull Request
5050

51-
* Fork the repo, create a branch, implement your changes, add any relevant Molecule tests, submit a PR when your changes are **tested** (using Molecule) and ready for review.
52-
* Fill in [our pull request template](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/.github/pull_request_template.md).
51+
- Fork the repo, create a branch, implement your changes, add any relevant Molecule tests, submit a PR when your changes are **tested** (using Molecule) and ready for review.
52+
- Fill in [our pull request template](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/.github/pull_request_template.md).
5353

5454
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.
5555

5656
## Code Guidelines
5757

5858
### Ansible Guidelines
5959

60-
* Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
61-
* Run `molecule test` on your code before you submit a PR to catch any potential issues. If you are testing a specific molecule scenario, run `molecule test -s <scenario>`. If you are testing the NGINX Plus scenario (`plus`), you will need to procure an NGINX Plus license (check out the [NGINX Plus developer license FAQ](https://www.nginx.com/developer-license-faqs/) to find out how to request one).
62-
* Follow these guides on some good practices for Ansible:
63-
* <https://www.ansible.com/blog/ansible-best-practices-essentials>
64-
* <https://docs.ansible.com/ansible/latest/user_guide/playbooks_best_practices.html>
60+
- Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
61+
- Run `molecule test` on your code before you submit a PR to catch any potential issues. If you are testing a specific molecule scenario, run `molecule test -s <scenario>`. If you are testing the NGINX Plus scenario (`plus`), you will need to procure an NGINX Plus license (check out the [NGINX Plus developer license FAQ](https://www.nginx.com/developer-license-faqs/) to find out how to request one).
62+
- Follow these guides on some good practices for Ansible:
63+
- <https://www.ansible.com/blog/ansible-best-practices-essentials>
64+
- <https://docs.ansible.com/ansible/latest/user_guide/playbooks_best_practices.html>
6565

6666
### Git Guidelines
6767

68-
* Keep a clean, concise and meaningful git commit history on your branch (within reason), rebasing locally and squashing before submitting a PR.
69-
* Follow the guidelines of writing a good commit message as described here <https://chris.beams.io/posts/git-commit/> and summarised in the next few points:
70-
* In the subject line, use the present tense ("Add feature" not "Added feature").
71-
* In the subject line, use the imperative mood ("Move cursor to..." not "Moves cursor to...").
72-
* Limit the subject line to 72 characters or less.
73-
* Reference issues and pull requests liberally after the subject line.
74-
* Add more detailed description in the body of the git message (`git commit -a` to give you more space and time in your text editor to write a good message instead of `git commit -am`).
68+
- Keep a clean, concise and meaningful git commit history on your branch (within reason), rebasing locally and squashing before submitting a PR.
69+
- Follow the guidelines of writing a good commit message as described here <https://chris.beams.io/posts/git-commit/> and summarised in the next few points:
70+
- In the subject line, use the present tense ("Add feature" not "Added feature").
71+
- In the subject line, use the imperative mood ("Move cursor to..." not "Moves cursor to...").
72+
- Limit the subject line to 72 characters or less.
73+
- Reference issues and pull requests liberally after the subject line.
74+
- Add more detailed description in the body of the git message (`git commit -a` to give you more space and time in your text editor to write a good message instead of `git commit -am`).

README.md

+30-16
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ This role configures NGINX Open Source and NGINX Plus on your target host.
1414

1515
### Ansible
1616

17-
* This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.12`).
18-
* When using Ansible core, you will also need to install the following collections:
17+
- This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.12`).
18+
- When using Ansible core, you will also need to install the following collections:
1919

2020
```yaml
2121
---
@@ -29,36 +29,50 @@ This role configures NGINX Open Source and NGINX Plus on your target host.
2929
```
3030
3131
**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.
32-
* Instructions on how to install Ansible can be found in the [Ansible website](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#upgrading-ansible-from-version-2-9-and-older-to-version-2-10-or-later).
32+
- Instructions on how to install Ansible can be found in the [Ansible website](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#upgrading-ansible-from-version-2-9-and-older-to-version-2-10-or-later).
3333
3434
### Jinja2
3535
36-
* This role uses Jinja2 templates. Ansible core installs Jinja2 by default, but depending on your install and/or upgrade path, you might be running an outdated version of Jinja2. The minimum version of Jinja2 required for the role to properly function is `2.11`.
37-
* Instructions on how to install Jinja2 can be found in the [Jinja2 website](https://jinja.palletsprojects.com/en/2.11.x/intro/#installation).
36+
- This role uses Jinja2 templates. Ansible core installs Jinja2 by default, but depending on your install and/or upgrade path, you might be running an outdated version of Jinja2. The minimum version of Jinja2 required for the role to properly function is `3.1`.
37+
- Instructions on how to install Jinja2 can be found in the [Jinja2 website](https://jinja.palletsprojects.com/en/3.1.x/intro/#installation).
3838

3939
### Molecule (Optional)
4040

41-
* Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `3.3`.
42-
* 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.*
43-
* To run the NGINX Plus/App Protect config Molecule tests, you must copy your NGINX Plus/App Protect license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/files/license/) folder.
41+
- Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `4.x`.
42+
- 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.*
43+
- To run the NGINX Plus/App Protect config Molecule tests, you must copy your NGINX Plus/App Protect license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/files/license/) folder.
4444

45-
You can alternatively add your NGINX Plus/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:
45+
You can alternatively add your NGINX Plus/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:
4646

47-
```bash
48-
export NGINX_CRT=$( cat <path to your certificate file> | base64 )
49-
export NGINX_KEY=$( cat <path to your key file> | base64 )
50-
molecule test -s plus
51-
```
47+
```bash
48+
export NGINX_CRT=$( cat <path to your certificate file> | base64 )
49+
export NGINX_KEY=$( cat <path to your key file> | base64 )
50+
molecule test -s plus
51+
```
5252

5353
## Installation
5454

5555
### Ansible Galaxy
5656

57-
Use `ansible-galaxy install nginxinc.nginx_config` to install the latest stable release of the role on your system.
57+
To install the latest stable release of the role on your system, use:
58+
59+
```bash
60+
ansible-galaxy install nginxinc.nginx_config
61+
```
62+
63+
Alternatively, if you have already installed the role, update the role to the latest release:
64+
65+
```bash
66+
ansible-galaxy install -f nginxinc.nginx_config
67+
```
5868

5969
### Git
6070

61-
Use `git clone https://github.com/nginxinc/ansible-role-nginx-config.git` to pull the latest edge commit of the role from GitHub.
71+
To pull the latest edge commit of the role from GitHub, use:
72+
73+
```bash
74+
git clone https://github.com/nginxinc/ansible-role-nginx-config.git
75+
```
6276

6377
## Platforms
6478

0 commit comments

Comments
 (0)