Skip to content

Commit 71650ed

Browse files
authored
Merge branch 'main' into nic-ngf-nginx-one-integration
2 parents 351a25e + 02b0041 commit 71650ed

29 files changed

+343
-323
lines changed

content/includes/nim/tech-specs/nim-app-protect-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ NGINX Instance Manager supports the following versions of [NGINX App Protect WAF
88

99
| NGINX Instance Manager | NGINX App Protect WAF |
1010
|------------------------|------------------------------------|
11-
| 2.17.0–2.19.2 | Release 4.8.0–4.14.0, 5.1.0–5.6.0 |
11+
| 2.17.0–2.20.0 | Release 4.8.0–4.15.0, 5.1.0–5.7.0 |
1212
| 2.15.1–2.16.0 | Release 4.8.0–4.10.0 |
1313
| 2.14.1–2.15.0 | Release 4.4.0–4.7.0 |
1414
| 2.13.0–2.14.0 | Release 4.3.0–4.5.0 |

content/includes/nim/tech-specs/security-data-plane-dependencies.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
The Security Monitoring module requires the following versions of [NGINX App Protect WAF](https://docs.nginx.com/nginx-app-protect/) and [NGINX Plus](https://www.f5.com/products/nginx/nginx-plus) for the **data plane**:
22

3+
{{< note >}}
4+
In NGINX Instance Manager 2.18.0 and under, the Security Monitoring module was a separate package that was installed manually.
5+
From NGINX Instance Manager 2.19.0 onward, Security Monitoring is part of the NGINX Instance Manager feature-set and is packaged by default; no manual installation or upgrade is needed.
6+
{{< /note >}}
7+
38
{{<bootstrap-table "table table-striped table-bordered">}}
49

510
| Security Monitoring | NGINX App Protect WAF |

content/includes/nim/tech-specs/security-management-plane-dependencies.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
The Security Monitoring module requires the following versions of NGINX Instance Manager to be installed on the **management plane**.
22

3-
{{< note >}}The Security Monitoring module doesn’t automatically install or upgrade NGINX Instance Manager. You’ll need to manually install or upgrade NGINX Instance Manager to a supported version.
3+
{{< note >}}
4+
In NGINX Instance Manager 2.18.0 and under, the Security Monitoring module was a separate package that was installed manually.
5+
From NGINX Instance Manager 2.19.0 onward, Security Monitoring is part of the NGINX Instance Manager feature-set and is packaged by default; no manual installation or upgrade is needed.
46
{{< /note >}}
57

68
{{<bootstrap-table "table table-striped table-bordered">}}

content/nginx/admin-guide/dynamic-modules/brotli.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The [ngx_brotli](https://github.com/google/ngx_brotli) module enables Brotli com
1919

2020
## Prerequisites
2121

22-
1. Check the [Technical Specifications]({{< ref "nginx/technical-specs.md" >}}) page to verify that the module is supported by your operating system.
22+
1. Check the [Technical Specifications]({{< ref "/nginx/technical-specs.md#dynamic-modules" >}}) page to verify that the module is supported by your operating system.
2323

2424
2. If required, install the **epel-release** dependency
2525

@@ -35,12 +35,11 @@ The [ngx_brotli](https://github.com/google/ngx_brotli) module enables Brotli com
3535
sudo yum update && \
3636
sudo yum install epel-release -y
3737
```
38-
39-
38+
3. Make sure that your operating system is configured to retrieve binary packages from the official NGINX Plus repository. See installation instructions for your operating system on the [Installing NGINX Plus]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-plus.md" >}}) page.
4039

4140
## Installation
4241

43-
Install the Brotli module package `nginx-plus-module-brotli`.
42+
Install the Brotli module package `nginx-plus-module-brotli` from the official NGINX Plus repository.
4443

4544
- for Amazon Linux 2 LTS, CentOS, Oracle Linux, and RHEL:
4645

@@ -77,8 +76,6 @@ Install the Brotli module package `nginx-plus-module-brotli`.
7776
sudo pkg install nginx-plus-module-brotli
7877
```
7978

80-
81-
8279
## Configuration
8380

8481
After installation you will need to enable and configure Brotli modules in NGINX Plus configuration file **nginx.conf**.
@@ -125,14 +122,12 @@ After installation you will need to enable and configure Brotli modules in NGINX
125122
nginx -s reload
126123
```
127124

125+
## More info
128126

127+
- [The `ngx_brotli` module GitHub project](https://github.com/google/ngx_brotli)
129128

130-
## More Info
131-
132-
- [NGINX Module for Brotli Compression Reference](https://github.com/google/ngx_brotli)
133-
134-
- [NGINX Dynamic Modules]({{< ref "dynamic-modules.md" >}})
129+
- [NGINX dynamic modules]({{< ref "dynamic-modules.md" >}})
135130

136-
- [NGINX Plus Technical Specifications]({{< ref "nginx/technical-specs.md" >}})
131+
- [NGINX Plus technical specifications]({{< ref "/nginx/technical-specs.md" >}})
137132

138-
- [Uninstalling a Dynamic Module]({{< ref "uninstall.md" >}})
133+
- [Uninstalling a dynamic module]({{< ref "uninstall.md" >}})

content/nginx/admin-guide/dynamic-modules/cookie-flag.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ type:
1010
- how-to
1111
---
1212

13-
{{< note >}} The `nginx-plus-module-cookie-flag` package is no longer available.{{< /note >}}
13+
{{< note >}} The `nginx-plus-module-cookie-flag` package is no longer available in the NGINX Plus repository.{{< /note >}}
1414

15-
The module was deprecated in [NGINX Plus Release 23]({{< ref "nginx/releases.md#r23" >}}) and removed in [NGINX Plus Release 26]({{< ref "nginx/releases.md#r26" >}}). Its functionality has been replaced with natively supported [`proxy_cookie_flags`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cookie_flags) directive.
15+
The module was deprecated in [NGINX Plus Release 23]({{< ref "/nginx/releases.md#r23" >}}) and removed in [NGINX Plus Release 26]({{< ref "/nginx/releases.md#r26" >}}). Its functionality has been replaced with natively supported [`proxy_cookie_flags`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cookie_flags) directive.
1616

17-
To remove the module, follow the [Uninstalling a Dynamic Module]({{< ref "uninstall.md" >}}) instructions.
17+
To remove the module, follow the [Uninstalling a dynamic module]({{< ref "uninstall.md" >}}) instructions.
1818

1919
To learn how to replace the module with the native solution, see [Native Method for Setting Cookie Flags](https://www.nginx.com/blog/nginx-plus-r23-released#cookie-flags) and the [`proxy_cookie_flags`](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cookie_flags) directive.
2020

2121

22-
## More Info
22+
## More info
2323

24-
- [NGINX Module Reference for Adding Cookie Flag](https://github.com/AirisX/nginx_cookie_flag_module)
24+
- [NGINX module reference for adding Cookie flag](https://github.com/AirisX/nginx_cookie_flag_module)
2525

26-
- [NGINX Dynamic Modules]({{< ref "dynamic-modules.md" >}})
26+
- [NGINX dynamic modules]({{< ref "dynamic-modules.md" >}})
2727

28-
- [NGINX Plus Technical Specifications]({{< ref "nginx/technical-specs.md" >}})
28+
- [NGINX Plus technical specifications]({{< ref "/nginx/technical-specs.md" >}})
2929

30-
- [Uninstalling a Dynamic Module]({{< ref "uninstall.md" >}})
30+
- [Uninstalling a dynamic module]({{< ref "uninstall.md" >}})

0 commit comments

Comments
 (0)