Skip to content

Commit 8d15650

Browse files
committed
Update README
1 parent 3d1daf8 commit 8d15650

File tree

3 files changed

+42
-38
lines changed

3 files changed

+42
-38
lines changed

.github/release-drafter.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ template: |
8888
8989
## Install & Upgrade
9090
91-
* To install the Ansible NGINX App Protect role on a fresh environment, run `ansible-galaxy install nginxinc.nginx_app_protect`.
92-
* To upgrade the Ansible NGINX App Protect role to the latest release, run `ansible-galaxy install -f nginxinc.nginx_app_protect`.
93-
* To install or upgrade to this specific Ansible NGINX App Protect role release ($RESOLVED_VERSION), run `ansible-galaxy install -f nginxinc.nginx_app_protect,v$RESOLVED_VERSION`.
91+
* To install the Ansible NGINX App Protect role on a fresh environment, run `ansible-galaxy install nginxinc.nginx_app_protect`.
92+
* To upgrade the Ansible NGINX App Protect role to the latest release, run `ansible-galaxy install -f nginxinc.nginx_app_protect`.
93+
* To install or upgrade to this specific Ansible NGINX App Protect role release ($RESOLVED_VERSION), run `ansible-galaxy install -f nginxinc.nginx_app_protect,v$RESOLVED_VERSION`.
9494
9595
## Resources
9696
97-
* Functional configuration examples (check `converge.yml` under each `molecule` scenario) -- [github.com/nginxinc/ansible-role-nginx-app-protect/tree/$RESOLVED_VERSION/molecule](https://github.com/nginxinc/ansible-role-nginx-app-protect/tree/$RESOLVED_VERSION/molecule).
98-
* Ansible Galaxy repository -- [galaxy.ansible.com/nginxinc/nginx_app_protect](https://galaxy.ansible.com/nginxinc/nginx_app_protect).
99-
* NGINX Ansible role & collection introductory blog -- [nginx.com/blog/announcing-nginx-core-collection-ansible](https://www.nginx.com/blog/announcing-nginx-core-collection-ansible).
100-
* NGINX: Better with Ansible demo -- [github.com/alessfg/nginx-ansible-demo](https://github.com/alessfg/nginx-ansible-demo).
97+
* Functional configuration examples (check `converge.yml` under each `molecule` scenario) -- [github.com/nginxinc/ansible-role-nginx-app-protect/tree/$RESOLVED_VERSION/molecule](https://github.com/nginxinc/ansible-role-nginx-app-protect/tree/$RESOLVED_VERSION/molecule).
98+
* Ansible Galaxy repository -- [galaxy.ansible.com/nginxinc/nginx_app_protect](https://galaxy.ansible.com/nginxinc/nginx_app_protect).
99+
* NGINX Ansible role & collection introductory blog -- [nginx.com/blog/announcing-nginx-core-collection-ansible](https://www.nginx.com/blog/announcing-nginx-core-collection-ansible).
100+
* NGINX: Better with Ansible demo -- [github.com/alessfg/nginx-ansible-demo](https://github.com/alessfg/nginx-ansible-demo).

README.md

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ This role installs and configures NGINX App Protect WAF or DoS for NGINX Plus on
1616

1717
## Requirements
1818

19+
### NGINX App Protect
20+
21+
If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this role, you will need to obtain the corresponding NGINX App Protect license beforehand.
22+
1923
### Ansible
2024

21-
* 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`).
22-
* When using Ansible base, you will also need to install the following collections:
25+
* 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`).
26+
* When using Ansible core, you will also need to install the following collections:
2327

2428
```yaml
2529
---
@@ -35,22 +39,22 @@ This role installs and configures NGINX App Protect WAF or DoS for NGINX Plus on
3539
3640
### Jinja2
3741
38-
* 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`.
42+
* 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`.
3943
* Instructions on how to install Jinja2 can be found in the [Jinja2 website](https://jinja.palletsprojects.com/en/2.11.x/intro/#installation).
4044

41-
### Molecule
45+
### Molecule (Optional)
4246

4347
* Molecule is used to test the various functionalities of the role. The recommended version of Molecule to test this role is `3.3`.
44-
* Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html).
45-
* To run the Molecule tests, you must first add your NGINX 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:
48+
* 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._
49+
* To run the Molecule tests, you must copy your NGINX App Protect license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/files/license/) folder.
4650

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
51-
```
51+
You can alternatively add your NGINX 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:
5252

53-
You can alternatively copy your NGINX license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/files/license/) folder.
53+
```bash
54+
export NGINX_CRT=$( cat <path to your certificate file> | base64 )
55+
export NGINX_KEY=$( cat <path to your key file> | base64 )
56+
molecule test
57+
```
5458

5559
## Installation
5660

@@ -75,14 +79,14 @@ Amazon Linux 2:
7579
- any
7680
CentOS:
7781
- 7.4+
82+
Debian:
83+
- stretch (9)
84+
- buster (10)
7885
RHEL:
7986
- 7.4+
80-
Debian:
81-
- 9
82-
- 10
8387
Ubuntu:
84-
- 18.04
85-
- 20.04
88+
- bionic (18.04)
89+
- focal (20.04)
8690
```
8791

8892
**Note:** Due to a packaging limitation in NGINX App Protect on Alpine, it may be required to explicitly install NGINX Plus on the instance **before** using the NGINX App Protect role if a hotfix version of NGINX Plus has been published. It is recommended to use the [NGINX Core](https://galaxy.ansible.com/nginxinc/nginx_core) Ansible role for this purpose.
@@ -95,25 +99,25 @@ The NGINX App Protect Ansible role supports all platforms supported by [NGINX Pl
9599
CentOS:
96100
- 7.4+
97101
Debian:
98-
- 10
102+
- buster (10)
99103
Ubuntu:
100-
- 18.04
101-
- 20.04
104+
- bionic (18.04)
105+
- focal (20.04)
102106
```
103107

104108
## Role Variables
105109

106110
This role has multiple variables. The descriptions and defaults for all these variables can be found in the **[`defaults/`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/defaults/)** folder in the following files:
107111

108-
|Name|Description|
109-
|----|-----------|
110-
|**[`main.yml`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/defaults/main.yml)**:|NGINX App Protect installation and configuration variables|
112+
| Name | Description |
113+
| ---- | ----------- |
114+
| **[`main.yml`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/defaults/main.yml)** | NGINX App Protect installation and configuration variables |
111115

112116
Similarly, descriptions and defaults for preset variables can be found in the **`vars/`** folder in the following files:
113117

114-
|Name|Description|
115-
|----|-----------|
116-
|**[`main.yml`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/vars/main.yml)**|List of supported NGINX App Protect platforms|
118+
| Name | Description |
119+
| ---- | ----------- |
120+
| **[`main.yml`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/vars/main.yml)** | List of supported NGINX App Protect platforms |
117121

118122
## Dependencies
119123

@@ -123,15 +127,15 @@ Similarly, descriptions and defaults for preset variables can be found in the **
123127

124128
A working functional playbook example can be found in the **`molecule/default/`** folder in the following file:
125129

126-
|Name|Description|
127-
|----|-----------|
128-
|**[`molecule/default/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/molecule/default/converge.yml)**|Install and configure NGINX App Protect|
130+
| Name | Description |
131+
| ---- | ----------- |
132+
| **[`molecule/default/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/molecule/default/converge.yml)** | Install and configure NGINX App Protect |
129133

130134
## Other NGINX Ansible Collections and Roles
131135

132136
You can find the Ansible NGINX Core collection of roles to install and configure NGINX Open Source, NGINX Plus, and NGINX App Protect WAF and DoS products [here](https://github.com/nginxinc/ansible-collection-nginx).
133137

134-
You can find the Ansible NGINX role to install NGINX [here](https://github.com/nginxinc/ansible-role-nginx).
138+
You can find the Ansible NGINX role to install NGINX OSS and NGINX Plus [here](https://github.com/nginxinc/ansible-role-nginx).
135139

136140
You can find the Ansible NGINX configuration role to configure NGINX [here](https://github.com/nginxinc/ansible-role-nginx-config).
137141

meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ galaxy_info:
88

99
license: Apache License, Version 2.0
1010

11-
min_ansible_version: 2.10
11+
min_ansible_version: 2.11
1212

1313
platforms:
1414
- name: Alpine

0 commit comments

Comments
 (0)