Skip to content

Commit 968bf3e

Browse files
authored
Update docs (#283)
1 parent 857ba8c commit 968bf3e

File tree

4 files changed

+91
-64
lines changed

4 files changed

+91
-64
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Steps to reproduce the behavior:
2020
A clear and concise description of what you expected to happen.
2121

2222
**Your environment:**
23-
- Version of the NGINX Role or specific commit
24-
- Version of Ansible
25-
- Target deployment platform
23+
- Version of the NGINX Role or specific commit
24+
- Version of Ansible
25+
- Target deployment platform
2626

2727
**Additional context**
2828
Add any other context about the problem here.

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
### Proposed changes
2-
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 here in this description (not in the title of the PR).
2+
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).
33

44
### Checklist
55
Before creating a PR, run through this checklist and mark each as complete.
66

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

CHANGELOG.md

Lines changed: 74 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,60 @@
11
# Changelog
22

3-
## 0.14.0
3+
## 0.15.0 (Unreleased)
4+
5+
BREAKING CHANGES:
6+
7+
* The Debian and Ubuntu repositories have slightly changed. You may run into some duplication issues when running the role on a preexisting target that already has had NGINX installed using the role. To fix this, manually remove the old repository source.
8+
* If you use `custom_options` you will now need to manually end each directive with a semicolon.
9+
10+
FEATURES:
11+
12+
* Add support to configure logrotate
13+
* Add support for Ubuntu Focal
14+
* Add support to configure SELinux
15+
16+
ENHANCEMENTS:
17+
18+
* Use `include_tasks` instead of `import_tasks` when possible to speed up the role's execution time
19+
* Improve configuration templating capabilities:
20+
* Add support for unix upstreams
21+
* Add PID templating option
22+
* Add support for down parameter in upstreams
23+
* Add option for custom error pages
24+
25+
BUG FIXES:
26+
27+
* `nginx_debug_output` would sometimes fail if the NGINX had not been automatically started by the system upon installation
28+
* If `http_demo_conf` was undefined the web server template interpolation would fail
29+
30+
## 0.14.0 (April 22, 2020)
431

532
This is a relatively minor release, but it includes a potential breaking change (hence the version bump). The one major new feature is the ability to install/build NGINX Open Source from source.
633

7-
Features:
34+
BREAKING CHANGES:
35+
36+
* The NGINX Controller agent can no longer be installed using this role. Please use the Ansible collection linked in the README.
37+
38+
FEATURES:
839

940
* Install/build NGINX from source options now available
1041
* Implement NGINX http sub module templating
1142
* NGINX config is now correctly validated each run
1243
* SSL Private Key data is hidden when running the role with the --diff flag
1344

14-
Bug fixes:
45+
BUG FIXES:
1546

1647
* The role should no longer sporadically cause apt update to fail in amd64 systems when installing NGINX from an official repository
1748
* Modules should now correctly install when using a specific NGINX Plus version
1849

19-
Breaking changes:
50+
## 0.13.0 (December 13, 2019)
2051

21-
* The NGINX Controller agent can no longer be installed using this role. Please use the Ansible collection linked in the README
52+
BREAKING CHANGES:
2253

23-
## 0.13.0
54+
* The new listen templating options are not backwards with the previous listen templating options. Check the `README` or `molecule/template_module/playbook.yml` for examples on how to use the new listen template.
55+
* BSD and Linux NGINX installation tasks have undergone some major changes. As such, you may have to update your playbooks accordingly.
2456

25-
Features:
57+
FEATURES:
2658

2759
* Improve NGINX http templating:
2860
* Multiple server support in HTTP contexts
@@ -42,20 +74,15 @@ Features:
4274
* Support for updating or removing NGINX from your system
4375
* Implemented tags to support running specific tasks instead of the whole role
4476

45-
Bug fixes:
77+
BUG FIXES:
4678

4779
* Module installation when using NGINX Plus has been fixed
4880
* Websockets templating has been reenabled after being accidentally deleted
4981
* When deleting your NGINX Plus license from the system, the NGINX Plus repository will also be deleted to prevent issues further down the line if you run a repository update since there will not be a license anymore to authenticate into the NGINX Plus repository.
5082

51-
Breaking changes:
52-
53-
* The new listen templating options are not backwards with the previous listen templating options. Check the `README` or `molecule/template_module/playbook.yml` for examples on how to use the new listen template.
54-
* BSD and Linux NGINX installation tasks have undergone some major changes. As such, you may have to update your playbooks accordingly.
55-
56-
## 0.12.0
83+
## 0.12.0 (May 22, 2019)
5784

58-
Features:
85+
FEATURES:
5986

6087
* Improve NGINX http templating - following parameters are now supported:
6188
* Websockets
@@ -68,13 +95,13 @@ Features:
6895
* Add basic NGINX stream templating
6996
* Add support for RHEL 8 and Alpine Linux
7097

71-
Bug fixes:
98+
BUG FIXES:
7299

73100
* Fix module installation tasks
74101

75-
## 0.11.0
102+
## 0.11.0 (Januray 14, 2019)
76103

77-
Features:
104+
FEATURES:
78105

79106
* Allow setting a custom apt and rpm signing key host
80107
* Add support for enabling an http to https redirects
@@ -85,110 +112,110 @@ Features:
85112
* Improve SSL defaults
86113
* Allow setting http or https server locations in proxy_pass
87114

88-
Bug fixes:
115+
BUG FIXES:
89116

90117
* Ignore undefined values for autoindex and health check
91118
* Clarify that the redirect variable refers to a http to https redirect
92119

93-
## 0.10.1
120+
## 0.10.1 (November 26, 2018)
94121

95-
Bug fixes:
122+
BUG FIXES:
96123

97124
* Fix HTML template to use correct variable name
98125

99-
## 0.10.0
126+
## 0.10.0 (November 26, 2018)
100127

101-
Features:
128+
FEATURES:
102129

103130
* Improve templating support for health checks, multiple location blocks, and auto indexing
104131

105-
Bug fixes:
132+
BUG FIXES:
106133

107134
* Fetching the NGINX signing key is now more reliable
108135
* Fixed HTML templating
109136

110-
## 0.9.0
137+
## 0.9.0 (October 18, 2018)
111138

112-
Features:
139+
FEATURES:
113140

114141
* Refactor NGINX templating and file uploading
115142
* Add ability to upload and template HTML files
116143
* Add ability to upload SSL keys and certificates
117144

118-
## 0.8.0
145+
## 0.8.0 (September 17, 2018)
119146

120-
Features:
147+
FEATURES:
121148

122149
* Add ability to install NGINX Plus Controller agent
123150
* Refactor installation of NGINX Amplify agent
124151
* Rename variables to be prefixed with `nginx_`
125152

126-
Bug fixes:
153+
BUG FIXES:
127154

128155
* Correct spelling of name in `tasks/prerequisites/setup-debian.yml`
129156

130-
## 0.7.1
157+
## 0.7.1 (August 21, 2018)
131158

132-
Features:
159+
FEATURES:
133160

134161
* Add enabled parameter to NGINX and NGINX Unit handlers
135162

136-
## 0.7.0
163+
## 0.7.0 (August 4, 2018)
137164

138-
Features:
165+
FEATURES:
139166

140167
* Add Amazon Linux 2 support for NGINX Plus
141168
* Add ability to delete NGINX Plus license after installation
142169

143-
Bug fixes:
170+
BUG FIXES:
144171

145172
* GeoIP module can now be properly installed
146173
* Module installation will no longer fail if only one module is specified
147174

148-
## 0.6.0
175+
## 0.6.0 (July 19, 2018)
149176

150-
Features:
177+
FEATURES:
151178

152179
* Improve NGINX Unit related documentation
153180
* Add FreeBSD and Amazon Linux 2 support for NGINX Unit
154181
* Allow users to install NGINX Unit without having to also install NGINX
155182

156-
## 0.5.0
183+
## 0.5.0 (June 28, 2018)
157184

158-
Features:
185+
FEATURES:
159186

160187
* Add support for NGINX Unit
161188

162-
## 0.4.0
189+
## 0.4.0 (May 25, 2018)
163190

164-
Features:
191+
FEATURES:
165192

166193
* Implement support for FreeBSD
167194
* Allow users to select the default NGINX repository
168195

169-
## 0.3.0
196+
## 0.3.0 (April 19, 2018)
170197

171-
New features:
198+
FEATURES:
172199

173200
* Improve Travis CI testing strategy
174201

175-
Bug fixes:
202+
BUG FIXES:
176203

177204
* Fix templating and push tasks
178205

179-
## 0.2.0
206+
## 0.2.0 (April 12, 2018)
180207

181-
New features:
208+
FEATURES:
182209

183210
* Add support for all first party NGINX modules
184211

185-
Bug fixes:
212+
BUG FIXES:
186213

187214
* Role should now work correctly in distros with old versions of Python
188215
* Rest API configuration will now only be created when rest_api_enable is set to true (an empty file would be created in previous versions if rest_api_enable was set to false)
189216
* Uploading/dynamically generating files should now result in the files being uploaded/created to/in the correct directory
190217

191-
## 0.1.0 - Initial release
218+
## 0.1.0 - Initial release (Januray 26, 2018)
192219

193220
Initial release of the NGINX Ansible role. Features include:
194221

CONTRIBUTING.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following is a set of guidelines for contributing to the NGINX Ansible role.
1818

1919
## Ask a Question
2020

21-
Please open an Issue on GitHub with the label `question`.
21+
Don't know how something works? Curious if the role can achieve your desired functionality. Please open an Issue on GitHub with the label `question`.
2222

2323
## Getting Started
2424

@@ -29,7 +29,7 @@ Follow our [Installation Guide](https://github.com/nginxinc/ansible-role-nginx/b
2929
* The NGINX Ansible role is written in `yaml` and supports open source NGINX, NGINX Plus, NGINX Amplify, and NGINX Unit.
3030
* The project follows the standard [Ansible role directory structure](https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html)
3131
* The main code is found in `tasks/`
32-
* The main variables can be found in `defaults/main/`
32+
* The main variables can be found in `defaults/main/*.yml`
3333
* Configuration templates for NGINX can be found in `templates/`
3434
* [Molecule](https://molecule.readthedocs.io/) tests can be found in `molecule/`.
3535
* CI/CD is done via Travis using `.travis.yml` deployment yaml files
@@ -46,13 +46,21 @@ To suggest an enhancement, please create an issue on GitHub with the label `enha
4646

4747
### Open a Pull Request
4848

49-
* Fork the repo, create a branch, submit a PR when your changes are tested (ideally using Molecule) and ready for review
49+
* Fork the repo, create a branch, submit a PR when your changes are **tested** (ideally using Molecule) and ready for review
5050
* Fill in [our pull request template](https://github.com/nginxinc/ansible-role-nginx/blob/master/.github/PULL_REQUEST_TEMPLATE.md)
5151

5252
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.
5353

5454
## Code Guidelines
5555

56+
### Ansible Guidelines
57+
58+
* Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
59+
* Run `molecule test --all` on your code before you submit a PR to catch any potential issues.
60+
* Follow these guides on some good practices for Ansible:
61+
* <https://www.ansible.com/blog/ansible-best-practices-essentials>
62+
* <https://docs.ansible.com/ansible/latest/user_guide/playbooks_best_practices.html>
63+
5664
### Git Guidelines
5765

5866
* Keep a clean, concise and meaningful git commit history on your branch (within reason), rebasing locally and squashing before submitting a PR
@@ -62,11 +70,3 @@ Note: if you’d like to implement a new feature, please consider creating a fea
6270
* Limit the subject line to 72 characters or less
6371
* Reference issues and pull requests liberally after the subject line
6472
* 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`)
65-
66-
### Ansible Guidelines
67-
68-
* Run `molecule lint` over your code to automatically resolve a lot of `yaml` and Ansible style issues.
69-
* Run `molecule test --all` on your code to catch any other issues.
70-
* Follow these guides on some good practices for Ansible:
71-
* <https://www.ansible.com/blog/ansible-best-practices-essentials>
72-
* <https://docs.ansible.com/ansible/latest/user_guide/playbooks_best_practices.html>

0 commit comments

Comments
 (0)