Merge branch 'main' into dot-org-changes

Author: TasoOneAsia

CONTRIBUTING.md

@@ -41,6 +41,7 @@ To understand how we use Git in this repository, read our [Git conventions](/doc
 The broad workflow is as follows:
 
 - Fork the NGINX repository
+  - If you're an F5/NGINX user, you can work from a clone
 - Create a branch
 - Implement your changes in your branch
 - Submit a pull request (PR) when your changes are ready for review

content/includes/licensing-and-reporting/apply-jwt.md

@@ -1,12 +1,15 @@
 ---
-docs:
 file:
   - content/solutions/about-subscription-licenses.md
   - content/nap-waf/v5/admin-guide/install.md
 ---
 
-1. Copy the license file to `/etc/nginx/license.jwt` on Linux or `/usr/local/etc/nginx/license.jwt` on FreeBSD for each NGINX Plus instance.
-2. Reload NGINX:
+1. Copy the license file to:
+
+   - `/etc/nginx/license.jwt` on Linux
+   - `/usr/local/etc/nginx/license.jwt` on FreeBSD
+
+1. Reload NGINX:
 
    ```shell
    systemctl reload nginx

content/includes/licensing-and-reporting/deploy-jwt-with-csgs.md

@@ -0,0 +1,16 @@
+---
+file:
+  - content/solutions/about-subscription-licenses.md
+---
+
+1. In the NGINX One Console, go to **Manage > Config Sync Groups**, then select your group.
+   
+   If you haven't created a Config Sync Group yet, see [Manage Config Sync Groups]({{< ref "/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md" >}}) for setup instructions.
+2. Select the **Configuration** tab, then choose **Edit Configuration**.
+3. Select **Add File**, then choose **New Configuration File**.
+4. In the **File name** field, enter:
+   - On Linux: `/etc/nginx/license.jwt`  
+   - On FreeBSD: `/usr/local/etc/nginx/license.jwt`  
+   The name must be exact.
+5. Paste the contents of your JWT license file into the editor.
+6. Select **Next** to preview the diff, then **Save and Publish** to apply the update.

…es/nginx-plus/nginx-openid-repo-note.txt …des/nginx-plus/nginx-openid-repo-note.mdcontent/includes/nginx-plus/nginx-openid-repo-note.txt renamed to content/includes/nginx-plus/nginx-openid-repo-note.md content/includes/nginx-plus/nginx-openid-repo-note.txt renamed to content/includes/nginx-plus/nginx-openid-repo-note.md

@@ -8,14 +8,12 @@ The following table lists the Linux distributions supported by NGINX Instance Ma
 
 {{<bootstrap-table "table table-striped table-bordered">}}
 
-| Distribution    | Version                                | Architecture     | NGINX Instance Manager Support                    | NGINX App Protect Support                          |
-|-----------------|----------------------------------------|------------------|---------------------------------------------------|----------------------------------------------------|
-| Amazon Linux    | 2 LTS                                  | x86_64           | Supported                                         | **Support discontinued as of 2.18.0**              |
-| 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**              |
-| Debian          | 11<hr>12                               | x86_64<hr>x86_64 | Supported<hr>Supported on 2.13.0+                 | Supported<hr>Supported                             |
-| 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                             |
-| 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 |
-| 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                             |
+| Distribution    | Version                                | Architecture     | NGINX Instance Manager Support                      | NGINX App Protect Support                          |
+|-----------------|----------------------------------------|------------------|-----------------------------------------------------|----------------------------------------------------|
+| Debian          | 11<hr>12                               | x86_64<hr>x86_64 | Supported<hr>Supported                              | Supported<hr>Supported                             |
+| Oracle Linux    | 8.0 and later in the 8.x family        | x86_64           | Supported                                           | Supported                                          |
+| RHEL            | 8.0 and later in the 8.x family<hr>9.0 and later in the 9.x family  | x86_64<hr>x86_64 | Supported<hr>Supported | Supported<hr>Supported                             |
+| Ubuntu          | 22.04<hr>24.04                         | x86_64<hr>x86_64 | Supported<hr>Supported on 2.18.0+                   | Supported<hr>Supported                             |
 
 {{</bootstrap-table>}}
 

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

@@ -69,19 +69,38 @@ To set up your other NGINX instances to use the proxy instance to connect to NGI
 2. Open the NGINX Agent configuration file (**/etc/nginx-agent/nginx-agent.conf**) with a text editor.
 3. Add the following configuration. Replace `YOUR_DATA_PLANE_KEY_HERE` with your actual data plane key and `YOUR_PROXY_IP_ADDRESS_HERE` with the IP address of the NGINX proxy instance.
 
-    ```yaml
+   {{< tabs name="Configure NGINX Agent to use the proxy" >}}
+
+   {{%tab name="NGINX Agent 3.x"%}}
+
+   ```yaml
+    command:
+      server:
+        # Replace YOUR_PROXY_IP_ADDRESS_HERE with the IP address of the NGINX proxy instance.
+        host: YOUR_PROXY_IP_ADDRESS_HERE
+        port: 5000
+      auth:
+        # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Console data plane key.
+        token: "YOUR_DATA_PLANE_KEY_HERE"
+      tls:
+        skip_verify: False
+   ```
+
+   {{%/tab%}}
+   {{%tab name="NGINX Agent 2.x"%}}
+   ```yaml
     server:
       # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Data Plane Key.
       token: "YOUR_DATA_PLANE_KEY_HERE"
       # Replace YOUR_PROXY_IP_ADDRESS_HERE with the IP address of the NGINX proxy instance.
       host: YOUR_PROXY_IP_ADDRESS_HERE
       grpcPort: 5000
-      command: agent.connect.nginx.com
-      metrics: agent.connect.nginx.com
     tls:
-      enable: true
-      skip_verify: false
-    ```
+      enable: True
+      skip_verify: False
+   ```
+   {{%/tab%}}
+   {{%/tabs%}}
 
 4. Restart NGINX Agent:
 

content/nginx-one/connect-instances/set-up-nginx-proxy-for-nginx-one.md

@@ -11,7 +11,9 @@ type:
 
 {{< note >}} The `nginx-plus-module-modsecurity` package is no longer available in the NGINX Plus repository.{{< /note >}}
 
-The ModSecurity WAF module was deprecated since [NGINX Plus Release 29]({{< ref "/nginx/releases.md#r29" >}}), and is no longer available since [NGINX Plus Release 32]({{< ref "/nginx/releases.md#r32" >}}).
+NGINX ModSecurity WAF officially reached End-of-Sale status on April 1, 2022 ([NGINX Plus Release 29]({{< ref "/nginx/releases.md#r29" >}})), and End-of-Life status on March 31, 2024 ([NGINX Plus Release 32]({{< ref "/nginx/releases.md#r32" >}})).
+
+For more details, [see this blog](https://www.f5.com/company/blog/nginx/f5-nginx-modsecurity-waf-transitioning-to-eol) announcement.
 
 To remove the module, follow the [Uninstalling a Dynamic Module]({{< ref "uninstall.md" >}}) instructions.
 

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

@@ -38,7 +38,7 @@ To quickly set up an NGINX Plus environment on AWS:
 	/etc/init.d/nginx status
 	```
 
-See [NGINX Plus on the AWS Cloud Quick Start](https://aws.amazon.com/quickstart/architecture/nginx-plus/) deployment guide for details.
+See [NGINX Plus on the AWS Cloud Quick Start](https://aws.amazon.com/blogs/apn/introducing-a-new-aws-quick-start-nginx-plus-on-the-aws-cloud-in-15-minutes/) deployment guide for details.
 
 ## What If I Need Help?
 

content/nginx/admin-guide/installing-nginx/installing-nginx-plus-amazon-web-services.md

@@ -16,7 +16,7 @@ See [Single Sign-On With Microsoft AD FS]({{< ref "nginx/deployment-guides/singl
 
 This guide explains how to enable single sign-on (SSO) for applications being proxied by F5 NGINX Plus. The solution uses OpenID Connect as the authentication mechanism, with [Microsoft Active Directory Federation Services](https://docs.microsoft.com/en-us/windows-server/identity/active-directory-federation-services) (AD FS) as the identity provider (IdP) and NGINX Plus as the relying party.
 
-{{< see-also >}}{{< readfile file="includes/nginx-openid-repo-note.txt" markdown="true" >}}{{< /see-also >}}
+{{< see-also >}}{{<include "nginx-plus/nginx-openid-repo-note">}}{{< /see-also >}}
 
 <span id="prereqs"></span>
 ## Prerequisites

content/nginx/deployment-guides/single-sign-on/oidc-njs/active-directory-federation-services.md

@@ -16,7 +16,7 @@ See [Single Sign-On With Auth0]({{< ref "nginx/deployment-guides/single-sign-on/
 
 You can use F5 NGINX Plus with [Auth0](https://auth0.com/) and OpenID Connect to enable single sign-on (SSO) for your proxied applications. By following the steps in this guide, you will learn how to set up SSO using OpenID Connect as the authentication mechanism, with Auth0 as the identity provider (IdP), and NGINX Plus as the relying party.
 
-{{< see-also >}}{{< readfile file="includes/nginx-openid-repo-note.txt" markdown="true" >}}{{< /see-also >}}
+{{< see-also >}}{{<include "nginx-plus/nginx-openid-repo-note">}}{{< /see-also >}}
 
 ## Prerequisites