chore: Update NGINX Agent includes (#1568)

* chore: clean up NGINX Agent includes

* fix: linting

Author: JTorreG

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

@@ -30,119 +30,28 @@ Complete the following steps on each host where you’ve installed NGINX Agent
 
 ### Uninstalling NGINX Agent on RHEL, CentOS, Rocky Linux, AlmaLinux, and Oracle Linux
 
-Complete the following steps on each host where you've installed NGINX Agent:
-
-1. Stop NGINX Agent:
-
-   ```bash
-   sudo systemctl stop nginx-agent
-   ```
-
-2. To uninstall NGINX Agent, run the following command:
-
-   ```bash
-   sudo yum remove nginx-agent
-   ```
+{{< include "agent/installation/uninstall/uninstall-rhel.md" >}}
 
 ### Uninstalling NGINX Agent on Ubuntu
 
-Complete the following steps on each host where you've installed NGINX Agent:
-
-1. Stop NGINX Agent:
-
-   ```bash
-   sudo systemctl stop nginx-agent
-   ```
-
-2. To uninstall NGINX Agent, run the following command:
-
-   ```bash
-   sudo apt-get remove nginx-agent
-   ```
-
-   > **Note:** The `apt-get remove <package>` command will remove the package from your system, while keeping the associated configuration files for possible future use. If you want to completely remove the package and all of its configuration files, you should use `apt-get purge <package>`.
+{{< include "agent/installation/uninstall/uninstall-ubuntu.md" >}}
 
 ### Uninstalling NGINX Agent on Debian
 
-Complete the following steps on each host where you've installed NGINX Agent:
-
-1. Stop NGINX Agent:
-
-   ```bash
-   sudo systemctl stop nginx-agent
-   ```
-
-2. To uninstall NGINX Agent, run the following command:
-
-   ```bash
-   sudo apt-get remove nginx-agent
-   ```
-
-   > **Note:** The `apt-get remove <package>` command will remove the package from your system, while keeping the associated configuration files for possible future use. If you want to completely remove the package and all of its configuration files, you should use `apt-get purge <package>`.
+{{< include "agent/installation/uninstall/uninstall-debian.md" >}}
 
 ### Uninstalling NGINX Agent on SLES
 
-Complete the following steps on each host where you've installed NGINX Agent:
-
-1. Stop NGINX agent:
-
-   ```bash
-   sudo systemctl stop nginx-agent
-   ```
-
-2. To uninstall NGINX agent, run the following command:
-
-   ```bash
-   sudo zypper remove nginx-agent
-   ```
+{{< include "agent/installation/uninstall/uninstall-sles.md" >}}
 
 ### Uninstalling NGINX Agent on Alpine Linux
 
-Complete the following steps on each host where you've installed NGINX agent:
-
-1. Stop NGINX agent:
-
-   ```bash
-   sudo rc-service nginx-agent stop
-   ```
-
-2. To uninstall NGINX agent, run the following command:
-
-   ```bash
-   sudo apk del nginx-agent
-   ```
+{{< include "agent/installation/uninstall/uninstall-alpine.md" >}}
 
-### Uninstalling NGINX Agent on Amazon Linux 2
-
-Complete the following steps on each host where you've installed NGINX agent:
+### Uninstalling NGINX Agent on Amazon Linux
 
-1. Stop NGINX agent:
-
-   ```bash
-   sudo systemctl stop nginx-agent
-   ```
+{{< include "agent/installation/uninstall/uninstall-amazon-linux.md" >}}
 
-2. To uninstall NGINX agent, run the following command:
-
-   ```bash
-   sudo yum remove nginx-agent
-   ```
-
-### Uninstalling NGINX Agent on Amazon Linux 2023
-
-Complete the following steps on each host where you've installed NGINX agent:
-
-1. Stop NGINX agent:
-
-   ```bash
-   sudo systemctl stop nginx-agent
-   ```
-
-2. To uninstall NGINX agent, run the following command:
-
-   ```bash
-   sudo dnf remove nginx-agent
-   ```
 ### Uninstalling NGINX Agent on FreeBSD
 
 Complete the following steps on each host where you've installed NGINX agent:

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

@@ -13,37 +13,12 @@ Learn how to upgrade NGINX Agent.
 
 ## Upgrade NGINX Agent
 
-To upgrade NGINX Agent, follow these steps:
-
-1. Open an SSH connection to the server where you’ve installed NGINX Agent and log in.
-
-1. Make a backup copy of the following locations to ensure that you can successfully recover if the upgrade has issues:
-
-    - `/etc/nginx-agent`
-    - `config_dirs` values for any configuration specified in `/etc/nginx-agent/nginx-agent.conf`
-
-1. Install the updated version of NGINX Agent:
-
-    - RHEL, RPM-Based
-
-        ```shell
-        sudo yum -y makecache
-        sudo yum update -y nginx-agent
-        ```
-
-    - Debian, Ubuntu, Deb-Based
-
-        ```shell
-        sudo apt-get update
-        sudo apt-get install -y --only-upgrade nginx-agent -o Dpkg::Options::="--force-confold"
-        ```
+{{< include "agent/installation/update.md" >}}
 
 ## Upgrade NGINX Agent to a Specific Version
 
 To upgrade NGINX Agent to a specific **v2.x version**, follow these steps:
 
-#### Steps to Upgrade:
-
 1. Open an SSH connection to the server running  NGINX Agent and log in.
 
 1. Back up the following files and directories to ensure you can restore the environment in case of issues during the upgrade:

content/agent/installation-upgrade/uninstall.md

@@ -35,7 +35,7 @@ authenticity. Fetch the key:
 
    The output should contain the following modulus:
 
-   ```
+   ```shell
    Public-Key: (2048 bit)
    Modulus:
       00:fe:14:f6:0a:1a:b8:86:19:fe:cd:ab:02:9f:58:
@@ -69,4 +69,10 @@ authenticity. Fetch the key:
 
    ```shell
    sudo apk add nginx-agent
-   ```
+   ```
+
+1. Verify the installation:
+
+    ```shell
+    sudo nginx-agent -v
+    ```

content/agent/installation-upgrade/upgrade.md

@@ -29,5 +29,18 @@ nd-files:
    sudo yum install nginx-agent
    ```
 
-1. When prompted to accept the GPG key, verify that the fingerprint matches
-`573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, and if so, accept it.
+   {{<call-out "tip" "Tip: Install specific versions" "" >}}
+   To install `nginx-agent` with a specific version (for example, 2.42.0):
+
+   ```shell
+   sudo yum install -y nginx-agent-2.42.0
+   ```
+   {{< /call-out >}}
+
+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.
+
+1. Verify the installation:
+
+    ```shell
+    sudo nginx-agent -v
+    ```

content/includes/agent/about.md

@@ -25,14 +25,21 @@ nd-files:
    --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
    ```
 
-   The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62`
-   as follows:
+    The output should contain the full fingerprints `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` as follows:
 
-   ```
-   pub   rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
-         573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
-   uid                      nginx signing key <signing-key@nginx.com>
-   ```
+    ```shell
+      pub   rsa4096 2024-05-29 [SC]
+            8540A6F18833A80E9C1653A42FD21310B49F6B46
+      uid                      nginx signing key <signing-key-2@nginx.com>
+
+      pub   rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
+            573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
+      uid                      nginx signing key <signing-key@nginx.com>
+
+      pub   rsa4096 2024-05-29 [SC]
+            9E9BE90EACBCDE69FE9B204CBCDCD8A38D88A2B3
+      uid                      nginx signing key <signing-key-3@nginx.com>
+    ```
 
    {{< call-out "important" >}}If the fingerprint is different, remove the file.{{< /call-out >}}
 
@@ -48,4 +55,21 @@ nd-files:
    ```shell
    sudo apt update
    sudo apt install nginx-agent
-   ```
+   ```
+
+   {{<call-out "tip" "Tip: Install specific versions" "" >}}
+   To install `nginx-agent` with a specific version (for 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 (for example, bullseye).
+
+   ```shell
+   sudo apt update
+   sudo apt install -y nginx-agent=2.42.0~<VERSION_CODENAME>
+   ```
+   {{< /call-out >}}
+
+1. Verify the installation:
+
+    ```shell
+    sudo nginx-agent -v
+    ```

content/includes/agent/architecture.md

@@ -13,20 +13,34 @@ nd-files:
 1. To set up the yum repository, create a file with name `/etc/yum.repos.d/nginx-agent.repo`
 with the following contents:
 
-    ```ini
-    [nginx-agent]
-    name=nginx agent repo
-    baseurl=http://packages.nginx.org/nginx-agent/centos/$releasever/$basearch/
-    gpgcheck=1
-    enabled=1
-    gpgkey=https://nginx.org/keys/nginx_signing.key
-    module_hotfixes=true
-    ```
+   ```ini
+   [nginx-agent]
+   name=nginx agent repo
+   baseurl=http://packages.nginx.org/nginx-agent/centos/$releasever/$basearch/
+   gpgcheck=1
+   enabled=1
+   gpgkey=https://nginx.org/keys/nginx_signing.key
+   module_hotfixes=true
+   ```
 
 1. To install `nginx-agent`, run the following command:
 
    ```shell
    sudo yum install nginx-agent
    ```
 
-   When prompted to accept the GPG key, verify that the fingerprint matches `573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62`, and if so, accept it.
+   {{<call-out "tip" "Tip: Install specific versions" "" >}}
+   To install `nginx-agent` with a specific version (for example, 2.42.0):
+
+   ```shell
+   sudo yum install -y nginx-agent-2.42.0
+   ```
+   {{< /call-out >}}
+
+   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.
+
+1. Verify the installation:
+
+   ```shell
+   sudo nginx-agent -v
+   ```