Skip to content

Commit ac6f23a

Browse files
committed
Markdown updates
1 parent 2681fbf commit ac6f23a

File tree

7 files changed

+228
-207
lines changed

7 files changed

+228
-207
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,28 @@ labels: ''
66
assignees: ''
77
---
88
### Describe the bug
9+
910
A clear and concise description of what the bug is.
1011

1112
### To reproduce
13+
1214
Steps to reproduce the behavior:
15+
1316
1. Deploy NGINX role using playbook.yml
1417
2. View output/logs/configuration on '...'
1518
3. See error
1619

1720
### Expected behavior
21+
1822
A clear and concise description of what you expected to happen.
1923

20-
### Your environment:
21-
- Version of the NGINX role or specific commit
22-
- Version of Ansible
23-
- Version of Jinja2 (if you are using any templating capability)
24-
- Target deployment platform
24+
### Your environment
25+
26+
- Version of the NGINX role or specific commit
27+
- Version of Ansible
28+
- Version of Jinja2 (if you are using any templating capability)
29+
- Target deployment platform
2530

2631
### Additional context
32+
2733
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ labels: ''
66
assignees: ''
77
---
88
### Is your feature request related to a problem? Please describe
9+
910
A clear and concise description of what the problem is. Ex. I'm always frustrated when ...
1011

1112
### Describe the solution you'd like
13+
1214
A clear and concise description of what you want to happen.
1315

1416
### Describe alternatives you've considered
17+
1518
A clear and concise description of any alternative solutions or features you've considered.
1619

1720
### Additional context
21+
1822
Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
### Proposed changes
2+
23
Describe the use case and detail of the change. If this PR addresses an issue on GitHub, make sure to include a link to that issue using one of the [supported keywords](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) here in this description (not in the title of the PR).
34

45
### Checklist
6+
57
Before creating a PR, run through this checklist and mark each as complete.
68

7-
- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/ansible-role-nginx/blob/main/CONTRIBUTING.md) document
8-
- [ ] I have added Molecule tests that prove my fix is effective or that my feature works
9-
- [ ] I have checked that any relevant Molecule tests pass after adding my changes
10-
- [ ] I have updated any relevant documentation (`defaults/main/*.yml`, `README.md` and `CHANGELOG.md`)
9+
- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/ansible-role-nginx/blob/main/CONTRIBUTING.md) document
10+
- [ ] I have added Molecule tests that prove my fix is effective or that my feature works
11+
- [ ] I have checked that any relevant Molecule tests pass after adding my changes
12+
- [ ] I have updated any relevant documentation (`defaults/main/*.yml`, `README.md` and `CHANGELOG.md`)

CHANGELOG.md

Lines changed: 170 additions & 162 deletions
Large diffs are not rendered by default.

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 5 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,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72-
73-
[homepage]: https://www.contributor-covenant.org
70+
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
71+
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
7472

7573
For answers to common questions about this code of conduct, see
76-
https://www.contributor-covenant.org/faq
74+
<https://www.contributor-covenant.org/faq>

CONTRIBUTING.md

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ The following is a set of guidelines for contributing to the NGINX Ansible role.
1111
[Contributing](#contributing)
1212

1313
[Code Guidelines](#code-guidelines)
14-
* [Git Guidelines](#git-guidelines)
15-
* [Ansible Guidelines](#ansible-guidelines)
14+
15+
* [Git Guidelines](#git-guidelines)
16+
* [Ansible Guidelines](#ansible-guidelines)
1617

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

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

2728
### Project Structure
2829

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

3839
## Contributing
3940

@@ -47,27 +48,27 @@ To suggest an enhancement, please create an issue on GitHub with the label `enha
4748

4849
### Open a Pull Request
4950

50-
* 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.
51-
* Fill in [our pull request template](https://github.com/nginxinc/ansible-role-nginx/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/blob/main/.github/pull_request_template.md).
5253

5354
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.
5455

5556
## Code Guidelines
5657

5758
### Ansible Guidelines
5859

59-
* Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
60-
* 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).
61-
* Follow these guides on some good practices for Ansible:
62-
* <https://www.ansible.com/blog/ansible-best-practices-essentials>
63-
* <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>
6465

6566
### Git Guidelines
6667

67-
* Keep a clean, concise and meaningful git commit history on your branch (within reason), rebasing locally and squashing before submitting a PR.
68-
* 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:
69-
* In the subject line, use the present tense ("Add feature" not "Added feature").
70-
* In the subject line, use the imperative mood ("Move cursor to..." not "Moves cursor to...").
71-
* Limit the subject line to 72 characters or less.
72-
* Reference issues and pull requests liberally after the subject line.
73-
* 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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ This role installs NGINX Open Source, NGINX Plus, or the NGINX Amplify agent on
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.11`) and Ansible (above `2.9.10`).
18-
* When using Ansible base, 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.11`) and Ansible (above `2.9.10`).
18+
* When using Ansible base, you will also need to install the following collections:
19+
1920
```yaml
2021
---
2122
collections:
@@ -24,18 +25,19 @@ This role installs NGINX Open Source, NGINX Plus, or the NGINX Amplify agent on
2425
- name: ansible.posix
2526
version: 1.2.0
2627
```
28+
2729
**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.
28-
* 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).
30+
* 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).
2931
3032
### Jinja2
3133
32-
* This role uses Jinja2 templates. Ansible base 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`.
33-
* Instructions on how to install Jinja2 can be found in the [Jinja2 website](https://jinja.palletsprojects.com/en/2.11.x/intro/#installation).
34+
* This role uses Jinja2 templates. Ansible base 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`.
35+
* Instructions on how to install Jinja2 can be found in the [Jinja2 website](https://jinja.palletsprojects.com/en/2.11.x/intro/#installation).
3436

3537
### Molecule
3638

37-
* Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `3.3`.
38-
* Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html).
39+
* Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `3.3`.
40+
* Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html).
3941

4042
## Installation
4143

0 commit comments

Comments
 (0)