Merge branch 'main' into unit/remove-docs

Author: JTorreG

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

@@ -67,7 +67,7 @@ Some directives cannot be overridden by the user provided configuration.
   |------------------ | ----------------------- | -----------------|
   | `user` | `nginx` | The `nginx` user has the correct permissions for accessing certificates, policy files and other auxfiles. |
   | `worker_processes` | `auto` | Set to `auto` to automatically set `worker_processes` to the number of CPU cores. |
-  | `worker_connections` |   <ul><li>Standard V2 plan `4000`</li><li>basic plan `3000`</li></ul> | To ensure reasonable performance of the NGINXaaS deployment for Standard V2 plan, the `worker_connections` is fixed at 400/NCU; for basic plan this is set lower.<br><br> Changing the value in the config has no effect on the NGINX process in the deployment. |
+  | `worker_connections` |   <ul><li>Standard V2 plan `4000`</li><li>basic plan `20`</li></ul> | To ensure reasonable performance of the NGINXaaS deployment for Standard V2 plan, the `worker_connections` is fixed at 400/NCU; for basic plan this is set lower.<br><br> Changing the value in the config has no effect on the NGINX process in the deployment. |
   | `pid` | `/run/nginx/nginx.pid` | Set to this value to allow NGINXaaS to automatically manage the NGINX master process. |
   | `daemon` | `on` | Automatically set to `on` to allow NGINXaaS to manage the NGINX master process. |
   | `master_process` | `on` | This directive is intended for NGINX developers. |

content/waf/fundamentals/technical-specifications.md

@@ -41,18 +41,19 @@ The F5 WAF for NGINX package has the following dependencies:
 
 | Module name                                | Description |
 | ------------------------------------------ | ----------- |
-| nginx-plus-module-appprotect               | NGINX Plus dynamic module for F5 WAF for NGINX |
-| app-protect-engine                         | The F5 WAF for NGINX enforcement engine        |
-| app-protect-plugin                         | The F5 WAF for NGINX connector API between the engine and the NGINX Plus dynamic module |
+| app-protect-attack-signatures              | The F5 WAF for NGINX attack signatures update package |
+| app-protect-bot-signatures                 | The F5 WAF for NGINX bot signatures update package |
+| app-protect-common                         | The F5 WAF for NGINX shared libraries package |
 | app-protect-compiler                       | The F5 WAF for NGINX enforcement engine compiler agent |
-| app-protect-common                         | The F5 WAF for NGINX shared libraries package | 
+| app-protect-engine                         | The F5 WAF for NGINX enforcement engine |
 | app-protect-geoip                          | The F5 WAF for NGINX geolocation update package |
 | app-protect-graphql                        | The F5 WAF for NGINX shared library package for GraphQL protection |
-| app-protect-attack-signatures              | The F5 WAF for NGINX attack signatures update package |
-| app-protect-threat-campaigns               | The F5 WAF for NGINX threat campaigns update package |
-| app-protect-bot-signatures                 | The F5 WAF for NGINX bot signatures update package |
-| app-protect-selinux (**1**)                | The prebuilt SELinux policy module for F5 WAF for NGINX |
 | app-protect-ip-intelligence (**1**, **2**) | Necessary for the IP intelligence feature |
+| app-protect-plugin                         | The F5 WAF for NGINX connector API between the engine and the NGINX Plus dynamic module |
+| app-protect-selinux (**1**)                | The prebuilt SELinux policy module for F5 WAF for NGINX |
+| app-protect-threat-campaigns               | The F5 WAF for NGINX threat campaigns update package |
+| nginx-plus-module-appprotect               | NGINX Plus dynamic module for F5 WAF for NGINX |
+
 
 1. _Optional dependencies_
 2. _This module needs to be installed separately, and includes a client for downloading and updating the feature's database_
@@ -63,4 +64,4 @@ The following security policy features are available with F5 WAF for NGINX.
 
 The names link to additional information in the [Policies]({{< ref "/waf/policies/configuration.md" >}}) section.
 
-{{< include "waf/table-policy-features.md" >}}
+{{< include "waf/table-policy-features.md" >}}

content/waf/install/virtual-environment.md

@@ -127,27 +127,6 @@ Install the F5 WAF for NGINX package and its dependencies:
 sudo dnf install app-protect
 ```
 
-### Ubuntu
-
-Add the F5 WAF for NGINX repositories:
-
-```shell
-printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
-https://pkgs.nginx.com/app-protect/ubuntu `lsb_release -cs` nginx-plus\n" | \
-sudo tee /etc/apt/sources.list.d/nginx-app-protect.list
-
-printf "deb [signed-by=/usr/share/keyrings/app-protect-security-updates.gpg] \
-https://pkgs.nginx.com/app-protect-security-updates/ubuntu `lsb_release -cs` nginx-plus\n" | \
-sudo tee /etc/apt/sources.list.d/app-protect-security-updates.list
-```
-
-Update the repositories, then install the F5 WAF for NGINX package and its dependencies:
-
-```shell
-sudo apt-get update
-sudo apt-get install app-protect
-```
-
 ### RHEL / Rocky Linux 9
 
 Add the F5 WAF for NGINX repository:
@@ -174,6 +153,27 @@ Install the F5 WAF for NGINX package and its dependencies:
 sudo dnf install app-protect
 ```
 
+### Ubuntu
+
+Add the F5 WAF for NGINX repositories:
+
+```shell
+printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
+https://pkgs.nginx.com/app-protect/ubuntu `lsb_release -cs` nginx-plus\n" | \
+sudo tee /etc/apt/sources.list.d/nginx-app-protect.list
+
+printf "deb [signed-by=/usr/share/keyrings/app-protect-security-updates.gpg] \
+https://pkgs.nginx.com/app-protect-security-updates/ubuntu `lsb_release -cs` nginx-plus\n" | \
+sudo tee /etc/apt/sources.list.d/app-protect-security-updates.list
+```
+
+Update the repositories, then install the F5 WAF for NGINX package and its dependencies:
+
+```shell
+sudo apt-get update
+sudo apt-get install app-protect
+```
+
 ## Update configuration files
 
 {{< include "waf/install-update-configuration.md" >}}
@@ -184,4 +184,4 @@ sudo dnf install app-protect
 
 ## Next steps
 
-{{< include "waf/install-next-steps.md" >}}
+{{< include "waf/install-next-steps.md" >}}

content/waf/policies/configuration.md

@@ -218,7 +218,10 @@ Similar to policies, it is customized from the base template, so it detects and
 To obtain the strict policy, execute the following command:
 
 ```shell
-sudo docker run --rm -v $(pwd):$(pwd) --entrypoint='' private-registry.nginx.com/nap/waf-compiler:1.0.0 cat /etc/app_protect/conf/NginxStrictPolicy.json
+sudo docker run --rm -v $(pwd):$(pwd) \
+    --entrypoint='' \
+    private-registry.nginx.com/nap/waf-compiler:1.0.0 \
+    cat /etc/app_protect/conf/NginxStrictPolicy.json
 ```
 
 Replace the `1.0.0` with the actual release version.
@@ -391,4 +394,4 @@ Be aware, however, that in a transparent policy no violations are blocked, even
         }
     }
 }
-```
+```