Skip to content

Commit 7942a98

Browse files
authored
Merge branch 'main' into newfield-nic-migration-update
2 parents d637268 + 296a336 commit 7942a98

File tree

7 files changed

+36
-31
lines changed

7 files changed

+36
-31
lines changed

_banners/waf-unification-notice.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
Welcome to the F5 WAF for NGINX documentation! This product was formerly known as NGINX App Protect WAF.
44

5-
Documentation is being incrementally rewritten: if you're looking for information that hasn't been re-integrated yet, you can still browse [the old documentation]({{< ref "/nap-waf" >}}).
6-
7-
{{< /banner >}}
5+
{{< /banner >}}

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 [F5 WAF for NGINX](htt
88

99
| NGINX Instance Manager | F5 WAF for NGINX |
1010
|------------------------|------------------------------------|
11-
| 2.17.0–2.20.0 | Release 4.8.0–4.16.0, 5.1.0–5.8.0 |
11+
| 2.17.0–2.20.0 | Release 4.8.0–4.16.0, 5.1.0–5.9.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/ngf/install/upgrade-version.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ Warning: kubectl apply should be used on resource created by either kubectl crea
6868

6969
{{% tab name="Helm" %}}
7070

71-
{{< call-out "important" >}} If you are using NGINX Plus and have a different Secret name than the default `nplus-license` name, specify the Secret name by setting `--set nginx.usage.secretName=<secret-name>` when running `helm install` or `helm upgrade`. {{< /call-out >}}
71+
72+
{{< call-out "important" "Important" >}}If you are using NGINX Plus and have a different Secret name than the default `nplus-license` name, specify the Secret name by setting `--set nginx.usage.secretName=<secret-name>` when running `helm install` or `helm upgrade`.{{< /call-out >}}
7273

7374
To upgrade the release with Helm, you can use the OCI registry, or download the chart and upgrade from the source.
7475

content/nic/configuration/global-configuration/command-line-arguments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ The default value is `false`.
666666

667667
When enabled, the controller automatically adjusts `proxy_buffers`, `proxy_buffer_size`, and `proxy_busy_buffers_size` to ensure they work together properly and NGINX can start successfully.
668668

669-
More explanation about this feature can be found in the guide [here](<ref "/nic/installation/configuration/proxy-buffers-configuration.md">).
669+
More explanation about this feature can be found in the guide [here]({{< ref "/nic/configuration/proxy-buffers-configuration.md" >}}).
670670

671671
<a name="cmdoption-enable-directive-autoadjust"></a>
672672

content/nim/nginx-app-protect/setup-waf-config-management.md

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ The table below shows which WAF compiler version to use for each version of F5 W
5555

5656
| F5 WAF for NGINX version | WAF compiler version |
5757
|-------------------------------|----------------------------|
58+
| 5.9.0 | nms-nap-compiler-v5.527.0 |
5859
| 5.8.0 | nms-nap-compiler-v5.498.0 |
5960
| 5.7.0 | nms-nap-compiler-v5.442.0 |
6061
| 5.6.0 | nms-nap-compiler-v5.342.0 |
@@ -85,18 +86,22 @@ The table below shows which WAF compiler version to use for each version of F5 W
8586

8687
{{</bootstrap-table>}}
8788

89+
{{< call-out "note" >}}
90+
Beginning with v5.9.0, both the installation packages for virtual machines and those for containers are categorized under the 5.x.x tag. For previous releases, packages designed for installation on virtual machines were released as 4.x.x versions (NAP 4.15.0, NAP 4.16.0, and so on.), while packages meant for installation on containers were provided as 5.x.x versions (NAP 5.7.0, NAP 5.8.0, and so on.).
91+
{{< /call-out >}}
92+
8893
### Debian or Ubuntu
8994

9095
To install the WAF compiler on Debian or Ubuntu, run the following command:
9196

9297
```shell
93-
sudo apt-get install nms-nap-compiler-v5.498.0
98+
sudo apt-get install nms-nap-compiler-v5.527.0
9499
```
95100

96101
If you want to install more than one version of the WAF compiler on the same system, append the `--force-overwrite` option to the install command after the first installation:
97102

98103
```shell
99-
sudo apt-get install nms-nap-compiler-v5.498.0 -o Dpkg::Options::="--force-overwrite"
104+
sudo apt-get install nms-nap-compiler-v5.527.0 -o Dpkg::Options::="--force-overwrite"
100105
```
101106

102107
{{< include "nim/nap-waf/restart-nms-integrations.md" >}}
@@ -120,7 +125,7 @@ To install the WAF compiler on RHEL 8.1 :
120125
3. Install the WAF compiler:
121126

122127
```shell
123-
sudo yum install nms-nap-compiler-v5.498.0
128+
sudo yum install nms-nap-compiler-v5.527.0
124129
```
125130

126131
### RHEL 9
@@ -142,7 +147,7 @@ To install the WAF compiler on RHEL 9:
142147
3. Install the WAF compiler:
143148

144149
```shell
145-
sudo yum install nms-nap-compiler-v5.498.0
150+
sudo yum install nms-nap-compiler-v5.527.0
146151
```
147152

148153
4. {{< include "nim/nap-waf/restart-nms-integrations.md" >}}
@@ -166,7 +171,7 @@ To install the WAF compiler on Oracle Linux 8.1:
166171
3. Install the WAF compiler:
167172

168173
```shell
169-
sudo yum install nms-nap-compiler-v5.498.0
174+
sudo yum install nms-nap-compiler-v5.527.0
170175
```
171176

172177
4. {{< include "nim/nap-waf/restart-nms-integrations.md" >}}
@@ -252,7 +257,7 @@ To install the WAF compiler on a system without internet access, complete these
252257

253258

254259
Note : Version of NAP compiler can be referred from the table at the top of this page.
255-
Current latest version 5.498.0 at the point of writing this document is used in below commands.
260+
Current latest version 5.527.0 at the point of writing this document is used in below commands.
256261

257262
{{<tabs name="WAF compiler installation in offline environment">}}
258263

@@ -282,10 +287,10 @@ sudo wget -q -O /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/fil
282287
mkdir -p compiler && cd compiler
283288
sudo apt-get update
284289
285-
sudo apt-get download nms-nap-compiler-v5.498.0
290+
sudo apt-get download nms-nap-compiler-v5.527.0
286291
cd ../
287292
mkdir -p compiler/compiler.deps
288-
sudo apt-get install --download-only --reinstall --yes --print-uris nms-nap-compiler-v5.498.0 | grep ^\' | cut -d\' -f2 | xargs -n 1 wget -P ./compiler/compiler.deps
293+
sudo apt-get install --download-only --reinstall --yes --print-uris nms-nap-compiler-v5.527.0 | grep ^\' | cut -d\' -f2 | xargs -n 1 wget -P ./compiler/compiler.deps
289294
290295
tar -czvf compiler.tar.gz compiler/
291296
```
@@ -328,11 +333,11 @@ sudo wget -q -O /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/fil
328333
mkdir -p compiler && cd compiler
329334
sudo apt-get update
330335
331-
sudo apt-get download nms-nap-compiler-v5.498.0
336+
sudo apt-get download nms-nap-compiler-v5.527.0
332337
333338
cd ../
334339
mkdir -p compiler/compiler.deps
335-
sudo apt-get install --download-only --reinstall --yes --print-uris nms-nap-compiler-v5.498.0 | grep ^\' | cut -d\' -f2 | xargs -n 1 wget -P ./compiler/compiler.deps
340+
sudo apt-get install --download-only --reinstall --yes --print-uris nms-nap-compiler-v5.527.0 | grep ^\' | cut -d\' -f2 | xargs -n 1 wget -P ./compiler/compiler.deps
336341
tar -czvf compiler.tar.gz compiler/
337342
```
338343

@@ -370,7 +375,7 @@ sudo yum-config-manager --disable rhel-9-appstream-rhui-rpms
370375
sudo yum update -y
371376
sudo mkdir -p nms-nap-compiler
372377
373-
sudo yumdownloader --resolve --destdir=nms-nap-compiler nms-nap-compiler-v5.498.0
378+
sudo yumdownloader --resolve --destdir=nms-nap-compiler nms-nap-compiler-v5.527.0
374379
tar -czvf compiler.tar.gz nms-nap-compiler/
375380
```
376381

@@ -414,7 +419,7 @@ EOF
414419
sudo yum update -y
415420
sudo mkdir -p nms-nap-compiler
416421
417-
sudo yumdownloader --resolve --destdir=nms-nap-compiler nms-nap-compiler-v5.498.0
422+
sudo yumdownloader --resolve --destdir=nms-nap-compiler nms-nap-compiler-v5.527.0
418423
tar -czvf compiler.tar.gz nms-nap-compiler/
419424
```
420425

@@ -1207,21 +1212,21 @@ sudo /opt/nms-nap-compiler/app_protect-<version>/bin/apcompile -h
12071212
**Example:**
12081213
12091214
```shell
1210-
sudo /opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile -h
1215+
sudo /opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile -h
12111216
```
12121217
12131218
**Expected output:**
12141219
12151220
```text
12161221
USAGE:
1217-
/opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile <options>
1222+
/opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile <options>
12181223
12191224
Examples:
1220-
/opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile -p /path/to/policy.json -o mypolicy.tgz
1221-
/opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile -p policyA.json -g myglobal.json -o /path/to/policyA_bundle.tgz
1222-
/opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile -g myglobalsettings.json --global-state-outfile /path/to/myglobalstate.tgz
1223-
/opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile -b /path/to/policy_bundle.tgz --dump
1224-
/opt/nms-nap-compiler/app_protect-5.498.0/bin/apcompile -l logprofA.json -o /path/to/logprofA_bundle.tgz
1225+
/opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile -p /path/to/policy.json -o mypolicy.tgz
1226+
/opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile -p policyA.json -g myglobal.json -o /path/to/policyA_bundle.tgz
1227+
/opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile -g myglobalsettings.json --global-state-outfile /path/to/myglobalstate.tgz
1228+
/opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile -b /path/to/policy_bundle.tgz --dump
1229+
/opt/nms-nap-compiler/app_protect-5.527.0/bin/apcompile -l logprofA.json -o /path/to/logprofA_bundle.tgz
12251230
```
12261231
12271232
### Confirm NGINX Agent configuration on the F5 WAF for NGINX instance

content/waf/changelog.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ _September 29th, 2025_
3333
### Important notes
3434

3535
- Restructured documentation
36-
- NGINX App Protect WAF renamed to F5 WAF for NGINX
37-
- Versions aligned for packages and other artefacts
38-
- No workflow or breaking changes
36+
- NGINX App Protect WAF renamed to F5 WAF for NGINX - no workflow or breaking changes
37+
- Packaged NAP version (VM-based or bare-metal deployments) alignment - renamed from v4 to v5 so both packaged and containerized offerings now share the same version number (v5.9).
38+
This doesn't introduce breaking changes.
39+
For example: Upgrades work exactly the same. Users can upgrade from v4.x (for example, 4.16) to 5.9 just as they did between earlier v4 releases (for example, 4.15 → 4.16).
3940
- Upgrade Go compiler to 1.23.12
4041

4142
### Packages
@@ -187,4 +188,4 @@ _April 1st, 2025_
187188
| Ubuntu 22.04 | _app-protect_34+5.342.0-1\~jammy_amd64.deb_ |
188189
| Ubuntu 24.04 | _app-protect_34+5.342.0-1\~noble_amd64.deb_ |
189190
| RHEL 8 and Rocky Linux 8 | _app-protect-34+5.342.0-1.el8.ngx.x86_64.rpm_ |
190-
| RHEL 9 | _app-protect-34+5.342.0-1.el9.ngx.x86_64.rpm_ |
191+
| RHEL 9 | _app-protect-34+5.342.0-1.el9.ngx.x86_64.rpm_ |

content/waf/install/kubernetes-plm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ nd-product: NAP-WAF
1818

1919
There are two new features available for Kubernetes through early access:
2020

21-
**Security policy orchestration**, which removes the need for compilaton by updating existing JSON security policies.
21+
**Security policy orchestration**, which removes the need for compilation by updating existing security policies. The supported security policy formats are JSON, YAML (where the security policy is defined inline within the AppPolicy CR), and Bundle.
2222

2323
**Automated signature updates**, which can auto-update security signatures.
2424

@@ -1379,4 +1379,4 @@ status:
13791379

13801380
- Verify the persistent volume is properly mounted
13811381
- Check storage permissions (Should be 101:101)
1382-
- Confirm PVC is bound to the correct PV
1382+
- Confirm PVC is bound to the correct PV

0 commit comments

Comments
 (0)