Skip to content

Commit 11921cd

Browse files
authored
Merge branch 'main' into nap-release-5.7
2 parents 027a26a + 07ca5df commit 11921cd

File tree

8 files changed

+279
-285
lines changed

8 files changed

+279
-285
lines changed

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Run analysis
37-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
37+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif

content/nginx-one/about.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,3 @@ NGINX One offers the following key benefits:
1919
- **Performance optimization**: Track your NGINX versions and receive recommendations for tuning your configurations for better performance.
2020
- **Graphical Metrics Display**: Access a dashboard that shows key metrics for your NGINX instances, including instance availability, version distribution, system health, and utilization trends.
2121
- **Real-time alerts**: Receive alerts about critical issues.
22-
23-
## Legal notice: Licensing agreements for NGINX products
24-
25-
Using NGINX One is subject to our End User Service Agreement (EUSA). For [NGINX Plus]({{< ref "/nginx" >}}), usage is governed by the End User License Agreement (EULA). Open source projects, including [NGINX Agent](https://github.com/nginx/agent) and [NGINX OSS](https://github.com/nginx/nginx), are covered under their respective licenses. For more details on these licenses, follow the provided links.

content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ sudo docker run \
107107

108108
For more details, see:
109109

110-
- [Deploying NGINX and NGINX Plus on Docker](https://docs.nginx.com/nginx/admin-guide/installing-nginx/installing-nginx-docker/)
111-
- [Full List of Agent Environment Variables](https://docs.nginx.com/nginx-agent/configuration/configuration-overview/#nginx-agent-environment-variables)
112-
- [NGINX One Data Plane Keys](https://docs.nginx.com/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys/)
110+
- [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md" >}})
111+
- [Full List of Agent Environment Variables]({{< ref "/agent/configuration/configuration-overview.md#cli-flags-and-environment-variables" >}})
112+
- [NGINX One Data Plane Keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}})
113113
- [My F5 Knowledge Article](https://my.f5.com/manage/s/article/K000090257)

content/nginx-one/glossary.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ This glossary defines terms used in the F5 NGINX One Console and F5 Distributed
2222
| **Tenant** | A tenant in F5 Distributed Cloud is an entity that owns a specific set of configuration and infrastructure. It is fundamental for isolation, meaning a tenant cannot access objects or infrastructure of other tenants. Tenants can be either individual or enterprise, with the latter allowing multiple users with role-based access control (RBAC). |
2323
{{</bootstrap-table>}}
2424

25+
## Legal notice: Licensing agreements for NGINX products
26+
27+
Using NGINX One is subject to our End User Service Agreement (EUSA). For [NGINX Plus]({{< ref "/nginx" >}}), usage is governed by the End User License Agreement (EULA). Open source projects, including [NGINX Agent](https://github.com/nginx/agent) and [NGINX Open Source](https://github.com/nginx/nginx), are covered under their respective licenses. For more details on these licenses, follow the provided links.
28+
2529
---
2630

2731
## References

content/nginx/admin-guide/installing-nginx/installing-nginx-plus.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,26 @@ NGINX Plus can be installed on the following versions of Debian or Ubuntu:
171171
- **For Debian**:
172172

173173
```shell
174-
sudo apt update
175-
sudo apt install apt-transport-https lsb-release ca-certificates wget gnupg2 debian-archive-keyring
174+
sudo apt update && \
175+
sudo apt install apt-transport-https \
176+
lsb-release \
177+
ca-certificates \
178+
wget \
179+
gnupg2 \
180+
debian-archive-keyring
176181
```
177182

178183
- **For Ubuntu**:
179184

180185
```shell
181-
sudo apt update
182-
sudo apt install apt-transport-https lsb-release ca-certificates wget gnupg2 ubuntu-keyring
186+
sudo apt update && \
187+
sudo apt install apt-transport-https \
188+
lsb-release \
189+
ca-certificates \
190+
wget \
191+
gnupg2 \
192+
ubuntu-keyring
183193
```
184-
185194
1. Download and add NGINX signing key:
186195

187196
```shell

content/nginx/releases.md

Lines changed: 252 additions & 268 deletions
Large diffs are not rendered by default.

content/nginx/technical-specs.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,10 @@ See [Sizing Guide for Deploying NGINX Plus on Bare Metal Servers](https://www.ng
163163
- [Limit Requests](https://nginx.org/en/docs/http/ngx_http_limit_req_module.html) – Limit rate of request processing for a client IP address or other keyed value
164164
- [Limit Responses](https://nginx.org/en/docs/http/ngx_http_core_module.html#limit_rate) – Limit rate of responses per client connection
165165

166-
### HTTP/2 and SSL/TLS
166+
### HTTP/2, HTTP/3 and SSL/TLS
167167

168168
- [HTTP/2](https://nginx.org/en/docs/http/ngx_http_v2_module.html) – Process HTTP/2 traffic
169+
- [HTTP/3](https://nginx.org/en/docs/http/ngx_http_v3_module.html) – Process HTTP/3 traffic
169170
- [SSL/TLS](https://nginx.org/en/docs/http/ngx_http_ssl_module.html) – Process HTTPS traffic
170171

171172
### Mail

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)