Merge branch 'main' into blocking-action

Author: ADubhlaoich

content/agent/installation-upgrade/installation-oss.md

@@ -50,10 +50,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     module_hotfixes=true
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo yum install nginx-agent
+    sudo yum install -y nginx-agent-2.42.0
     ```
 
     When prompted to accept the GPG key, verify that the fingerprint matches `8540 A6F1 8833 A80E 9C16 53A4 2FD2 1310 B49F 6B46`, `573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, `9E9B E90E ACBC DE69 FE9B 204C BCDC D8A3 8D88 A2B3`, and if so, accept it.
@@ -105,11 +105,13 @@ Before you install NGINX Agent for the first time on your system, you need to se
       | sudo tee /etc/apt/sources.list.d/nginx-agent.list
     ```
 
-1. To install `nginx-agent`, run the following commands:
-
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
+   
+    Update your package index and install a specific version of the nginx-agent. Replace <VERSION_CODENAME> with your current Ubuntu codename (e.g., jammy, noble).
+   
     ```shell
     sudo apt update
-    sudo apt install nginx-agent
+    sudo apt install -y nginx-agent=2.42.0~<VERSION_CODENAME>
     ```
 
 1. Verify the installation:
@@ -166,12 +168,13 @@ Before you install NGINX Agent for the first time on your system, you need to se
       http://packages.nginx.org/nginx-agent/debian/ `lsb_release -cs` agent" \ | sudo tee /etc/apt/sources.list.d/nginx-agent.list
     ```
 
-1. To install `nginx-agent`, run the following commands:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
+    Update your package index and install a specific version of the nginx-agent. Replace <VERSION_CODENAME> with your current Debian codename (e.g., bullseye).
+    
     ```shell
     sudo apt update
-    sudo apt install nginx-agent
-    ```
+    sudo apt install -y nginx-agent=2.42.0~<VERSION_CODENAME>
 
 1. Verify the installation:
 
@@ -229,10 +232,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     sudo rpmkeys --import /tmp/nginx_signing.key
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo zypper install nginx-agent
+    sudo zypper install -y nginx-agent=2.42.0
     ```
 
 1. Verify the installation:
@@ -303,10 +306,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     sudo mv /tmp/nginx_signing.rsa.pub /etc/apk/keys/
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo apk add nginx-agent
+    sudo apk add nginx-agent=2.42.0
     ```
 
 1. Verify the installation:
@@ -334,10 +337,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     module_hotfixes=true
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo dnf install nginx-agent
+    sudo dnf install -y nginx-agent-2.42.0
     ```
 
 1. When prompted to accept the GPG key, verify that the fingerprint matches
@@ -370,10 +373,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     module_hotfixes=true
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo yum install nginx-agent
+    sudo yum install -y nginx-agent-2.42.0
     ```
 
 1. When prompted to accept the GPG key, verify that the fingerprint matches `8540 A6F1 8833 A80E 9C16 53A4 2FD2 1310 B49F 6B46`, `573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, `9E9B E90E ACBC DE69 FE9B 204C BCDC D8A3 8D88 A2B3`, and if so, accept it.
@@ -396,10 +399,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     }
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo pkg install nginx-agent
+    sudo pkg install nginx-agent-2.42.0
     ```
 
 1. Verify the installation:

content/agent/installation-upgrade/installation-plus.md

@@ -73,10 +73,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     enabled=1
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo yum install nginx-agent
+    sudo yum install -y nginx-agent-2.42.0
     ```
 
     When prompted to accept the GPG key, verify that the fingerprint matches `8540 A6F1 8833 A80E 9C16 53A4 2FD2 1310 B49F 6B46`, `573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, `9E9B E90E ACBC DE69 FE9B 204C BCDC D8A3 8D88 A2B3`, and if so, accept it.
@@ -131,11 +131,13 @@ Before you install NGINX Agent for the first time on your system, you need to se
       | sudo tee /etc/apt/sources.list.d/nginx-agent.list
     ```
 
-1. To install `nginx-agent`, run the following commands:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
+     Update your package index and install a specific version of the nginx-agent. Replace <VERSION_CODENAME> with your current Ubuntu codename (e.g., jammy, noble).
+   
     ```shell
     sudo apt update
-    sudo apt install nginx-agent
+    sudo apt install -y nginx-agent=2.42.0~<VERSION_CODENAME>
     ```
 
 1. Verify the installation:
@@ -183,12 +185,14 @@ Before you install NGINX Agent for the first time on your system, you need to se
     Acquire::https::pkgs.nginx.com::SslKey      "/etc/ssl/nginx/nginx-repo.key";
     ```
 
-1. To install `nginx-agent`, run the following commands:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
+    Update your package index and install a specific version of the nginx-agent. Replace <VERSION_CODENAME> with your current Debian codename (e.g., bullseye).
+    
     ```shell
     sudo apt update
-    sudo apt install nginx-agent
-    ```
+    sudo apt install -y nginx-agent=2.42.0~<VERSION_CODENAME>
+
 
 1. Verify the installation:
 
@@ -265,10 +269,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     sudo rpmkeys --import /tmp/nginx_signing.key
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo zypper install nginx-agent
+    sudo zypper install -y nginx-agent=2.42.0
     ```
 
 1. Verify the installation:
@@ -394,10 +398,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     enabled=1
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo dnf install nginx-agent
+    sudo dnf install -y nginx-agent-2.42.0
     ```
 
 1. When prompted to accept the GPG key, verify that the fingerprint matches `8540 A6F1 8833 A80E 9C16 53A4 2FD2 1310 B49F 6B46`, `573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, `9E9B E90E ACBC DE69 FE9B 204C BCDC D8A3 8D88 A2B3`, and if so, accept it.
@@ -442,10 +446,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     enabled=1
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo yum install nginx-agent
+    sudo yum install -y nginx-agent-2.42.0
     ```
 
 1. When prompted to accept the GPG key, verify that the fingerprint matches `8540 A6F1 8833 A80E 9C16 53A4 2FD2 1310 B49F 6B46`, `573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, `9E9B E90E ACBC DE69 FE9B 204C BCDC D8A3 8D88 A2B3`, and if so, accept it.
@@ -496,10 +500,10 @@ Before you install NGINX Agent for the first time on your system, you need to se
     SSL_CLIENT_KEY_FILE: "/etc/ssl/nginx/nginx-repo.key" }
     ```
 
-1. To install `nginx-agent`, run the following command:
+1. To install `nginx-agent` with a specific version (example: 2.42.0):
 
     ```shell
-    sudo pkg install nginx-agent
+    sudo pkg install nginx-agent-2.42.0
     ```
 
 1. Verify the installation:

content/agent/installation-upgrade/upgrade.md

@@ -60,10 +60,10 @@ To upgrade NGINX Agent to a specific **v2.x version**, follow these steps:
         sudo apt-get install -y nginx-agent=<specific-version> -o Dpkg::Options::="--force-confold"
         ```
 
-        Example (to upgrade to version 2.41.1~noble):
+        Example (to upgrade to version 2.42.0~noble):
 
         ```shell
-        sudo apt-get install -y nginx-agent=2.41.1~noble -o Dpkg::Options::="--force-confold"
+        sudo apt-get install -y nginx-agent=2.42.0~noble -o Dpkg::Options::="--force-confold"
         ```
 
     - CentOS, RHEL, RPM-Based
@@ -72,10 +72,10 @@ To upgrade NGINX Agent to a specific **v2.x version**, follow these steps:
         sudo yum install -y nginx-agent-<specific-version>
         ```
 
-        Example (to upgrade to version `2.41.1`):
+        Example (to upgrade to version `2.42.0`):
 
         ```shell
-        sudo yum install -y nginx-agent-2.41.1
+        sudo yum install -y nginx-agent-2.42.0
         ```
 
 1. Verify the installed version:

content/includes/nginx-plus/nginx-openid-repo-note.txt renamed to content/includes/nginx-plus/nginx-openid-repo-note.md

@@ -74,31 +74,29 @@ To set up your other NGINX instances to use the proxy instance to connect to NGI
    {{%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
-      server_name: "agent.connect.nginx.com"
+    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
-   command:
-   server:
+    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
-      port: 443
-   auth:
-      # Replace YOUR_DATA_PLANE_KEY_HERE with your NGINX One Console data plane key.
-      token: "YOUR_DATA_PLANE_KEY_HERE"
-   tls:
+      grpcPort: 5000
+    tls:
+      enable: True
       skip_verify: False
    ```
    {{%/tab%}}

content/nginx-one/connect-instances/set-up-nginx-proxy-for-nginx-one.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
 

content/nginx/deployment-guides/single-sign-on/oidc-njs/auth0.md

@@ -16,7 +16,7 @@ See [Single Sign-On With Amazon Cognito]({{< ref "nginx/deployment-guides/single
 
 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 [Amazon Cognito](https://aws.amazon.com/cognito/) 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>

content/nginx/deployment-guides/single-sign-on/oidc-njs/cognito.md

@@ -16,7 +16,7 @@ See [Single Sign-On With Keycloak]({{< ref "nginx/deployment-guides/single-sign-
 
 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 [Keycloak](https://www.keycloak.org/) 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>