Skip to content

Commit d7be439

Browse files
ADubhlaoichADubhlaoich
authored
Merge branch 'main' into docs/architecture-guide
2 parents f7c965a + 24c3c86 commit d7be439

File tree

48 files changed

+1754
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1754
-750
lines changed

‎.github/workflows/coveo.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ jobs:
4141
"type": "User",
4242
"name": "anonymous",
4343
"provider": "Email Security Provider"
44+
},
45+
{
46+
"type": "User",
47+
"name": "[email protected]",
48+
"provider": "Email Security Provider"
4449
}
4550
]
4651
}')

‎.github/workflows/linkchecker.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ env:
3131
--ignore-url ^https://lightstep.com --ignore-url ^https://www.owasp.org/ --ignore-url ^https://www.maxmind.com --ignore-url ^https://www.splunk.com/
3232
--ignore-url ^https://oauth2.googleapis.com --ignore-url ^https://openidconnect.googleapis.com --ignore-url ^https://www.base64url.com/
3333
--ignore-url ^https://go.googlesource.com/ --ignore-url ^https://go.googlesource.com/sync --ignore-url ^https://linkerd.io/2.13/
34-
--ignore-url ^http://www.redirectpage.com/ --ignore-url ^https://www.gnu.org/ --ignore-url ^https://insert_your_tenant_name.console.ves.volterra.io/
35-
--ignore-url ^https://INSERT_YOUR_TENANT_NAME.console.ves.volterra.io
34+
--ignore-url ^http://www.redirectpage.com/ --ignore-url ^https://www.gnu.org/ --ignore-url ^https://insert_your_tenant_name.console.ves.volterra.io
3635
--ignore-url ^https://\([a-zA-Z0-9-]+\).nginx.com/nginx-ingress-controller/css
3736
--ignore-url ^https://\([a-zA-Z0-9-]+\).nginx.com/nginxaas/azure/css
3837
--ignore-url ^https://\([a-zA-Z0-9-]+\).nginx.com/nginx-gateway-fabric/css

‎content/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
title: NGINX Product Documentation
33
description: Learn how to deliver, manage, and protect your applications using F5 NGINX products.
4-
---
4+
---

‎content/agent/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: NGINX Agent
33
url: /nginx-agent/
44
cascade:
5-
logo: NGINX-product-icon.png
5+
logo: NGINX-Agent-product-icon.svg
66
nd-banner:
77
enabled: true
88
type: deprecation

‎content/agent/configuration/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Configuration"
33
weight: "400"
44
url: /nginx-agent/configuration/
55
cascade:
6-
logo: NGINX-product-icon.png
6+
logo: NGINX-product-icon.svg
77
layout: agent-v2-migration
88
---
99

‎content/agent/installation-upgrade/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: Learn how to install, upgrade, and uninstall NGINX Agent.
44
weight: 300
55
url: /nginx-agent/v2/installation-upgrade/
66
cascade:
7-
logo: NGINX-product-icon.png
7+
logo: NGINX-product-icon.svg
88
type: agent-v2-migration
99
---

‎content/agent/installation-upgrade/container-environments/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ description: Learn how to build and run NGINX Agent docker images.
44
weight: 800
55
url: /nginx-agent/v2/installation-upgrade/container-environments/
66
cascade:
7-
logo: NGINX-product-icon.png
7+
logo: NGINX-product-icon.svg
88
type: agent-v2-migration
99
---

‎content/includes/installation/add-nms-repo.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ Add the NGINX Instance Manager repository:
2525
sudo yum module disable nginx:1.14
2626
sudo yum module enable nginx:1.20
2727
```
28+
- **RHEL 9**: If you're installing NGINX Open Source package from the yum repository on RHEL 9, run the following commands to use the new version of NGINX Open Source (1.20 at the time of this update):
29+
30+
```bash
31+
sudo yum install nginx-1.20.*
32+
```
2833
2934
- **Amazon Linux 2**
3035

‎content/includes/nap-waf/policy.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3705,7 +3705,14 @@ <h2 id="policy/override-rules">override-rules</h2>
37053705
<li><strong>headers['&lt;name&gt;']</strong>: (map-type) The value of the specified header name. Example: "headers['Accept'].startsWith('application')"</li>
37063706
</ul>
37073707
</blockquote>
3708-
<p><strong>Note</strong>: The "headers['&lt;name&gt;']" attribute does not support 'Cookie' as a header name. Attribute "clientIp" supports using "ipAddressLists" in condition: "clientIp.matches(ipAddressLists['<name>'])</p></td>
3708+
<dl>
3709+
<dt><strong>Note</strong>:</dt>
3710+
<dd><ul>
3711+
<li>The "headers['&lt;name&gt;']" attribute does not support 'Cookie' as a header name.</li>
3712+
<li>Attribute "clientIp" supports using "ipAddressLists" in condition: "clientIp.matches(ipAddressLists['&lt;name&gt;'])"</li>
3713+
</ul>
3714+
</dd>
3715+
</dl></td>
37093716
<td></td>
37103717
</tr>
37113718
<tr class="odd">

‎content/includes/nginx-plus/supported-distributions.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ docs:
33
---
44

55
{{<bootstrap-table "table table-striped table-bordered">}}
6-
| Distribution | Supported on R34 | Supported on R33 |
6+
| Distribution | Supported on R35 | Supported on R34 |
77
|-------------------------------------|----------------------------------------------------|--------------------------------------------------------|
8-
| AlmaLinux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
9-
| Alpine Linux | 3.18 (x86_64, aarch64) **(deprecated)** <br> 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) <br> 3.21 (x86_64, aarch64) **(new)** | 3.17 (x86_64, aarch64) **(deprecated)** <br> 3.18 (x86_64, aarch64) <br> 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) **(new)** |
8+
| AlmaLinux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) <br> 10 (x86_64, aarch64) **(new)** | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
9+
| Alpine Linux | 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) <br> 3.21 (x86_64, aarch64) <br> 3.22 (x86_64, aarch64) **(new)** | 3.18 (x86_64, aarch64) **(deprecated)** <br> 3.19 (x86_64, aarch64) <br> 3.20 (x86_64, aarch64) <br> 3.21 (x86_64, aarch64) **(new)** |
1010
| Amazon Linux | 2023 (x86_64, aarch64) | 2023 (x86_64, aarch64) |
1111
| Amazon Linux 2 | LTS (x86_64, aarch64) | LTS (x86_64, aarch64) |
1212
| Debian | 11 (x86_64, aarch64) <br> 12 (x86_64, aarch64) | 11 (x86_64, aarch64) <br> 12 (x86_64, aarch64) |
13-
| FreeBSD | 13 (amd64) <br> 14 (amd64) | 13 (amd64) <br> 14 (amd64) |
13+
| FreeBSD | 13.5+ (amd64) <br> 14.3+ (amd64) | 13 (amd64) <br> 14 (amd64) |
1414
| Oracle Linux | 8.1+ (x86_64, aarch64) <br> 9 (x86_64) | 8.1+ (x86_64, aarch64) <br> 9 (x86_64) |
15-
| Red Hat Enterprise Linux (RHEL) | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) |
15+
| Red Hat Enterprise Linux (RHEL) | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) <br> 10.0+ (x86_64, aarch64) **(new)** | 8.1+ (x86_64, aarch64) <br> 9.0+ (x86_64, aarch64) |
1616
| Rocky Linux | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) | 8 (x86_64, aarch64) <br> 9 (x86_64, aarch64) |
17-
| SUSE Linux Enterprise Server (SLES) | 15 SP2+ (x86_64) | 12 SP5 (x86_64) **(deprecated)** <br> 15 SP2+ (x86_64) |
18-
| Ubuntu | 20.04 LTS (x86_64, aarch64) **(deprecated)** <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) | 20.04 LTS (x86_64, aarch64) <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) |
17+
| SUSE Linux Enterprise Server (SLES) | 15 SP6+ (x86_64) | 15 SP2+ (x86_64) |
18+
| Ubuntu | 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) | 20.04 LTS (x86_64, aarch64) **(deprecated)** <br> 22.04 LTS (x86_64, aarch64) <br> 24.04 LTS (x86_64, aarch64) |
1919
{{</bootstrap-table>}}

0 commit comments

Comments
 (0)