Skip to content

Commit 5d8a199

Browse files
ADubhlaoichADubhlaoich
authored
Merge branch 'main' into nic/upgrade-instructions
2 parents fe71933 + e183ef5 commit 5d8a199

File tree

9 files changed

+37
-42
lines changed

9 files changed

+37
-42
lines changed

‎.github/workflows/build-push.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ jobs:
101101
value: `${{ github.event.client_payload.author }}`,
102102
short: true
103103
},
104+
{
105+
title: 'Description',
106+
value: `${{ github.event.client_payload.description }}`,
107+
short: false
108+
},
104109
{
105110
title: 'Preview URL',
106111
value: `${{ env.PREVIEW_URL }}`,

‎content/includes/nim/tech-specs/supported-distros.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ The following table lists the Linux distributions supported by NGINX Instance Ma
88

99
{{<bootstrap-table "table table-striped table-bordered">}}
1010

11-
| Distribution | Version | Architecture | NGINX Instance Manager Support | NGINX App Protect Support |
11+
| Distribution | Version | Architecture | NGINX Instance Manager Support | NGINX App Protect Support |
1212
|-----------------|----------------------------------------|------------------|---------------------------------------------------|----------------------------------------------------|
13-
| Amazon Linux | 2 LTS | x86_64 | Supported | **Support discontinued as of 2.18.0** |
14-
| CentOS | 7.4 and later in the 7.x family | x86_64 | **Support discontinued as of 2.17.0** | Supported |
13+
| Amazon Linux | 2 LTS | x86_64 | Supported | **Support discontinued as of 2.18.0** |
14+
| CentOS | 7.4 and later in the 7.x family | x86_64 | **Support discontinued as of 2.17.0** | **Support discontinued as of 2.17.0** |
1515
| Debian | 11<hr>12 | x86_64<hr>x86_64 | Supported<hr>Supported on 2.13.0+ | Supported<hr>Supported |
16-
| Oracle Linux | 7.4 and later in the 7.x family<hr>8.0 and later in the 8.x family | x86_64<hr>x86_64 | Supported<hr>Supported on 2.6.0+ | Supported<hr>Supported |
17-
| RHEL | 7.4 and later in the 7.x family<hr>8.x and later in the 8.x family<hr>9.x and later in the 9.x family | x86_64<hr>x86_64<hr>x86_64 | **Support discontinued as of 2.17.0**<hr>Supported<hr>Supported on 2.6.0+ | Supported<hr>Supported<hr>Supported |
18-
| Ubuntu | 20.04<hr>22.04<hr>24.04 | x86_64<hr>x86_64<hr>x86_64 | Supported<hr>Supported on 2.3.0+<hr>Supported on 2.18.0+ | Supported<hr>Supported<hr>Supported |
16+
| Oracle Linux | 7.4 and later in the 7.x family<hr>8.0 and later in the 8.x family | x86_64<hr>x86_64 | **Support discontinued as of 2.17.0**<hr>Supported on 2.6.0+ | **Support discontinued as of 2.17.0**<hr>Supported |
17+
| RHEL | 7.4 and later in the 7.x family<hr>8.x and later in the 8.x family<hr>9.x and later in the 9.x family | x86_64<hr>x86_64<hr>x86_64 | **Support discontinued as of 2.17.0**<hr>Supported<hr>Supported on 2.6.0+ | **Support discontinued as of 2.17.0**<hr>Supported<hr>Supported |
18+
| Ubuntu | 20.04<hr>22.04<hr>24.04 | x86_64<hr>x86_64<hr>x86_64 | Supported<hr>Supported on 2.3.0+<hr>Supported on 2.18.0+ | **Support discontinued as of NAP 4.15.0/5.7.0**<hr>Supported<hr>Supported |
1919

2020
{{</bootstrap-table>}}
2121

‎content/nginx-one/_index.md‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ F5 NGINX One Console makes it easy to manage NGINX instances across locations an
2222

2323
{{<card-layout>}}
2424
{{<card-section showAsCards="true" isFeaturedSection="true">}}
25-
{{<card title="Get started" titleUrl="/nginx-one/getting-started/" isFeatured="true" icon="unplug">}}
25+
{{<card title="Get started" titleUrl="/nginx-one/getting-started/" icon="unplug" isFullSize="true">}}
2626
Get up and running with NGINX One Console
2727
{{</card >}}
2828
{{</card-section>}}
@@ -38,37 +38,27 @@ F5 NGINX One Console makes it easy to manage NGINX instances across locations an
3838
Manage one instance or groups of instances. Monitor certificates. Set up metrics.
3939
{{</card>}}
4040
{{<card title="Secure with NGINX App Protect" titleUrl="/nginx-one/nap-integration/" >}}
41-
Manage one instance or groups of instances. Monitor certificates. Set up metrics.
41+
Set up security policies by instance and group
4242
{{</card>}}
4343
{{<card title="Connect Kubernetes deployments" titleUrl="/nginx-one/k8s/">}}
4444
Monitor deployments for CVEs and certificates
4545
{{</ card >}}
46-
{{<card title="Organize users with RBAC" titleUrl="/nginx-one/rbac/" >}}
47-
Assign responsibilities with role-based access control
48-
{{</card>}}
49-
{{<card title="Automate with the NGINX One API" titleUrl="/nginx-one/api/" >}}
50-
Manage your NGINX fleet over REST
51-
{{</card>}}
5246
{{</card-section>}}
5347
{{</card-layout>}}
5448

5549
### More information
5650

5751
{{<card-layout>}}
5852
{{<card-section showAsCards="true" >}}
59-
{{<card title="Glossary" titleUrl="/nginx-one/glossary/" >}}
60-
See latest updates: New features, improvements, and bug fixes
53+
{{<card title="Connect Kubernetes deployments" titleUrl="/nginx-one/k8s/">}}
54+
Monitor deployments for CVEs and certificates
55+
{{</ card >}}
56+
{{<card title="Organize users with RBAC" titleUrl="/nginx-one/rbac/" >}}
57+
Assign responsibilities with role-based access control
6158
{{</card>}}
62-
{{<card title="Changelog" titleUrl="/nginx-one/changelog/" icon="clock-alert">}}
63-
See latest updates: New features, improvements, and bug fixes
59+
{{<card title="Automate with the NGINX One Console API" titleUrl="/nginx-one/api/" >}}
60+
Manage your NGINX fleet over REST
6461
{{</card>}}
65-
{{</card-section>}}
66-
{{</card-layout>}}
67-
68-
### More information
69-
70-
{{<card-layout>}}
71-
{{<card-section showAsCards="true" >}}
7262
{{<card title="Glossary" titleUrl="/nginx-one/glossary/" >}}
7363
See latest updates: New features, improvements, and bug fixes
7464
{{</card>}}
@@ -83,31 +73,31 @@ F5 NGINX One Console makes it easy to manage NGINX instances across locations an
8373

8474
{{<card-layout>}}
8575
{{< card-section title="Kubernetes Solutions">}}
86-
{{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" brandIcon="NGINX-Ingress-Controller-product-icon">}}
76+
{{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" brandIcon="NGINX-Ingress-Controller-product-icon.png">}}
8777
Kubernetes traffic management with API gateway, identity, and observability features.
8878
{{</ card >}}
89-
{{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric" brandIcon="NGINX-product-icon">}}
79+
{{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric" brandIcon="NGINX-product-icon.png">}}
9080
Next generation Kubernetes connectivity using the Gateway API.
9181
{{</ card >}}
9282
{{</ card-section >}}
9383
{{< card-section title="Local Console Option">}}
94-
{{< card title="NGINX Instance Manager" titleUrl="/nginx-instance-manager" brandIcon="NGINX-Instance-Manager-product-icon">}}
84+
{{< card title="NGINX Instance Manager" titleUrl="/nginx-instance-manager" brandIcon="NGINX-Instance-Manager-product-icon.png">}}
9585
Track and control NGINX Open Source and NGINX Plus instances.
9686
{{</ card >}}
9787
{{</ card-section >}}
9888
{{< card-section title="Modern App Delivery">}}
99-
{{< card title="NGINX Plus" titleUrl="/nginx" brandIcon="NGINX-Plus-product-icon-RGB">}}
89+
{{< card title="NGINX Plus" titleUrl="/nginx" brandIcon="NGINX-Plus-product-icon-RGB.png">}}
10090
The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway.
10191
{{</ card >}}
102-
{{< card title="NGINX Open Source" titleUrl="https://nginx.org" brandIcon="NGINX-product-icon">}}
92+
{{< card title="NGINX Open Source" titleUrl="https://nginx.org" brandIcon="NGINX-product-icon.png">}}
10393
The open source all-in-one load balancer, content cache, and web server
10494
{{</ card >}}
10595
{{</ card-section >}}
10696
{{< card-section title="Security">}}
107-
{{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" brandIcon="NGINX-App-Protect-WAF-product-icon">}}
97+
{{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" brandIcon="NGINX-App-Protect-WAF-product-icon.png">}}
10898
Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs.
10999
{{</ card >}}
110-
{{< card title="NGINX App Protect DoS" titleUrl="/nginx-app-protect-dos" brandIcon="NGINX-App-Protect-DoS-product-icon">}}
100+
{{< card title="NGINX App Protect DoS" titleUrl="/nginx-app-protect-dos" brandIcon="NGINX-App-Protect-DoS-product-icon.png">}}
111101
Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs.
112102
{{</ card >}}
113103
{{</ card-section >}}

‎content/nginx-one/agent/overview/_index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
title: "Overview"
33
weight: 100
4-
url: /nginx-one/agent/install-upgrade/
5-
---
4+
url: /nginx-one/agent/overview/
5+
---

‎content/nginxaas-azure/getting-started/nginx-configuration/overview.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ Some directives cannot be overridden by the user provided configuration.
7474

7575
## NGINX listen port restrictions
7676

77-
- Due to port restrictions on Azure Load Balancer health probes, ports `19`, `21`, `70`, and `119` are not allowed. The NGINXaaS deployment can listen on all other ports.
77+
- Due to port restrictions on Azure Load Balancer health probes, certain ports are not allowed for the `listen` directive in NGINX configuration. The following ports are blocked:
78+
- `19`, `21`, `70`, `119` - Azure health probe restricted ports
79+
- `49151`, `49153`, `5140`, `50000`, `54141`, `54779` - reserved ports to support other NGINXaaS features
7880

7981
- The [Basic]({{< ref "/nginxaas-azure/billing/overview.md#basic-plan" >}}) plan (and the deprecated Standard (v1) plan) supports a maximum of 5 listen ports in the NGINX configuration. Configurations that specify over 5 unique ports are rejected.
8082

‎content/nginxaas-azure/quickstart/upgrade-channels.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Maintaining the latest version NGINX Plus, operating system (OS), and other soft
1515
{{<bootstrap-table "table table-striped table-bordered">}}
1616
| Channel | Description |
1717
|-------------|---------------------------|
18-
| preview | Selecting this channel automatically upgrades your deployment to the latest supported version of NGINX Plus and its dependencies soon after they become available. We recommend using this setting to try out new capabilities in deployments running in your development, testing, and staging environments. |
18+
| preview | Selecting this channel automatically upgrades your deployment to the latest supported version of NGINX Plus and its dependencies soon after they become available. We recommend using this setting to try out new capabilities in deployments running in your development, testing, and staging environments. Avoid using it in your production environment. |
1919
| stable | A deployment running on this channel will receive updates on NGINX Plus and its dependencies at a slower rate than the **Preview** channel. We recommend using this setting for production deployments where you might want stable features instead of the latest ones. This is the **default channel** if you do not specify one for your deployment. |
2020
{{</bootstrap-table>}}
2121

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/nginxinc/docs
22

33
go 1.19
44

5-
require github.com/nginxinc/nginx-hugo-theme v0.43.5 // indirect
5+
require github.com/nginxinc/nginx-hugo-theme v0.43.6 // indirect

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
github.com/nginxinc/nginx-hugo-theme v0.43.4 h1:fnUGTcpR/pwwgBIy2dv0fOkeT++cqv1T6G1LKqQRAFg=
2-
github.com/nginxinc/nginx-hugo-theme v0.43.4/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
3-
github.com/nginxinc/nginx-hugo-theme v0.43.5 h1:OCsB4Y5mWN0fDzev+rie62zVXciR89vgsQ5Ss8mxUn8=
4-
github.com/nginxinc/nginx-hugo-theme v0.43.5/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
1+
github.com/nginxinc/nginx-hugo-theme v0.43.6 h1:G9flRI3mMsETE5QHNXQ8ozesJvlRM9qBlrkzYHgZrdc=
2+
github.com/nginxinc/nginx-hugo-theme v0.43.6/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=

‎layouts/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ <h1 class="homepage-item-text">
404404
More NGINX Products
405405
</div>
406406

407-
<a href="https://unit.nginx.org/" alt="NGINX Unit">
407+
<a href="{{ .Site.BaseURL }}nginx-unit" alt="NGINX Unit">
408408
<div class="homepage-item">
409409
<div class="homepage-item-heading">
410410
<div class="homepage-item-logo">

0 commit comments

Comments
 (0)