Merge pull request #7180 from nmelehan-akamai/rc-v1.360.0

* [update] Securing Nginx With ModSecurity (#7167)

Fixes: #6803

* [NEW] Getting Started with HAProxy Part 2: HTTP Load Balancing (#7095)

* Getting Started with HAProxy Part 2: HTTP Load Balancing

* Tech Edit 1

* Tech Edit 2

* Tech Edit 3

* Tech Edit 4

* Copy edits

---------

Co-authored-by: Nathan Melehan <nmelehan@gmail.com>

* [update] January Marketplace doc updates (#7178)

* jan marketplace distro& instruction

* rabbitmq lts add

* review for January Marketplace release

* review for January Marketplace release

---------

Co-authored-by: Magda Sulik <you@example.com>

* Update theme (#7179)

- Update onetrust geolocation

Co-authored-by: Nathan Melehan <nmelehan@gmail.com>

---------

Co-authored-by: Rajakavitha Kodhandapani <krajakavitha@gmail.com>
Co-authored-by: Adam Overa <adamovera@protonmail.com>
Co-authored-by: Nathan Melehan <nmelehan@gmail.com>
Co-authored-by: hmorris3293 <hmorris@akamai.com>
Co-authored-by: Magda Sulik <you@example.com>

Author: 6 people

_vendor/github.com/linode/linode-docs-theme/layouts/partials/sections/head.html

@@ -1,4 +1,4 @@
-# github.com/linode/linode-docs-theme v0.0.0-20250110174948-7f99bcdf9fa2
+# github.com/linode/linode-docs-theme v0.0.0-20250124183022-1528603da313
 # github.com/linode/linode-website-partials v0.0.0-20250103220935-91c22c1d82ec
 # github.com/gohugoio/hugo-mod-jslibs-dist/alpinejs/v3 v3.21300.20800
 # github.com/gohugoio/hugo-mod-jslibs/turbo/v8 v8.20000.20400

_vendor/modules.txt

@@ -198,15 +198,15 @@ ModSecurity is a firewall and therefore requires rules to function. This section
 1.  Copy over the unicode mapping file and the ModSecurity configuration file from your cloned ModSecurity GitHub repository:
 
         sudo cp /opt/ModSecurity/unicode.mapping /etc/nginx/modsec
-        sudo cp /opt/ModSecurity/modsecurity.conf-recommended /etc/nginx/modsec/modsecurity.conf
+        sudo cp /opt/ModSecurity/modsecurity.conf-recommended /etc/nginx/modsec
 
-1. Remove the `.recommended` extension from the ModSecurity configuration filename with the following command:
+1. Remove the `-recommended` extension from the ModSecurity configuration filename with the following command:
 
-        sudo cp /etc/modsecurity/modsecurity.conf-recommended /etc/modsecurity/modsecurity.conf
+        sudo cp /etc/nginx/modsec/modsecurity.conf-recommended /etc/nginx/modsec/modsecurity.conf
 
-1.  With a text editor such as vim, open `/etc/modsecurity/modsecurity.conf` and change the value for `SecRuleEngine` to `On`:
+1.  With a text editor such as vim, open `/etc/nginx/modsec/modsecurity.conf` and change the value for `SecRuleEngine` to `On`:
 
-    {{< file "/etc/modsecurity/modsecurity.conf" aconf >}}
+    {{< file "/etc/nginx/modsec/modsecurity.conf" aconf >}}
 # -- Rule engine initialization ----------------------------------------------
 
 # Enable ModSecurity, attaching it to every transaction. Use detection

docs/guides/security/basics/securing-nginx-with-modsecurity/index.md

@@ -29,35 +29,49 @@ In addition to the core infrastructure, there are a number of freely available D
 
 ## Configuration Options
 
-- **Supported distributions:** Ubuntu 22.04 LTS
+- **Supported distributions:** Ubuntu 24.04 LTS
 - **Recommended minimum plan:** All plan types and sizes can be used.
 
 ### Drupal Options
 
-- **Database Root Password** *(required)*: Password for your Drupal site's MariaDB database `root` user.
-- **Database User Password** *(required)*: Password for your Drupal site's MariaDB database `drupal` user.
+- **Email address** *(required)*: Email address to use for generating the SSL certificates.
+- **Drupal Site Name** *(required)*: Drupal site name.
+- **Drupal Site Email** *(required)*: Drupal site email for system notifications.
+- **Drupal Account Email** *(required)*: Drupal account email address for an admin user.
+- **Drupal User Name** *(required)*: Admin username for the Drupal site.
+
+{{% content "marketplace-required-limited-user-fields-shortguide" %}}
+
+{{% content "marketplace-custom-domain-fields-shortguide" %}}
 
 {{% content "marketplace-special-character-limitations-shortguide" %}}
 
-## Getting Started after Deployment
+### Obtain the Credentials
 
-### Access your Drupal Site
+Once the app is deployed, you need to obtain the credentials from the server.
 
-1.  Open a web browser and navigate to the domain you entered when creating the instance: `https://domain.tld`. If you did not enter a domain, use your Compute Instance's default rDNS domain (`192-0-2-1.ip.linodeusercontent.com`). See the [Managing IP Addresses](/docs/products/compute/compute-instances/guides/manage-ip-addresses/) guide for information on viewing the rDNS value. Ensure that you are securely accessing the website by prefixing `https` to the URL.
+To obtain the credentials:
 
-1.  The initial configuration and installation screen for your Drupal site should be displayed. Follow the prompts for the **Choose language**, **Choose profile**, and **Verify requirements** screens, selecting the appropriate configuration values for your Drupal site.
+1.  Log in to your new Compute Instance using one of the methods below:
 
-    ![Screenshot of the Drupal installation screen](drupal-install.png)
+    - **Lish Console**: Log in to Cloud Manager, click the **Linodes** link in the left menu, and select the Compute Instance you just deployed. Click **Launch LISH Console**. Log in as the `root` user. To learn more, see [Using the Lish Console](/docs/products/compute/compute-instances/guides/lish/).
+    - **SSH**: Log in to your Compute Instance over SSH using the `root` user. To learn how, see [Connecting to a Remote Server Over SSH](/docs/guides/connect-to-server-over-ssh/).
 
-1.  In the **Database configuration** screen, fill in the form with the values listed below. Click on **Save and Continue** when you are done.
+1.  Run the following command to access the credentials file:
 
-    - **Database name:** `drupaldb`
-    - **Database username:** `drupal`
-    - **Database password:** Enter the database user password you created when deploying the instance.
+    ```command
+    cat /home/$USERNAME/.credentials
+    ```
 
-1. Continue to follow the prompts for the **Configure site** screen and select the appropriate configuration values for your Drupal site. When complete, you are brought to your Drupal site's admin panel where you can begin [building your Drupal site](https://www.drupal.org/documentation/build).
+This returns passwords that were automatically generated when the instance was deployed. Save them. Once saved, you can safely delete the file.
 
-    ![Screenshot of the Drupal admin panel](drupal-admin.png)
+## Getting Started after Deployment
+
+### Access your Drupal Site
+
+To access your Drupal site:
+
+1.  Open a web browser and navigate to the domain you entered when creating the instance: `https://domain.tld`. If you didn't provide a domain, use your Compute Instance's default rDNS domain (`192-0-2-1.ip.linodeusercontent.com`). To learn more on viewing the rDNS value, see [Managing IP Addresses](/docs/products/compute/compute-instances/guides/manage-ip-addresses/). Make sure to use the `https` prefix in the URL to access the website securely.
 
 ## Software Included
 
@@ -66,13 +80,8 @@ The Drupal Marketplace App installs the following required software on your Lino
 | **Software** | **Description** |
 |:--------------|:------------|
 | [**MariaDB Server**](https://mariadb.org/) | Relational database. |
-| [**PHP 8**](https://www.php.net) | Drupal is written in PHP and requires PHP to operate. |
+| [**PHP**](https://www.php.net) | Drupal is written in PHP and requires PHP to operate. |
 | [**Apache HTTP Server**](https://httpd.apache.org) | Web Server used to serve the Drupal site. |
-| [**Drupal 10**](https://www.drupal.org/about/10) | Content management system. |
+| [**Drupal**](https://www.drupal.org/) | Content management system. |
 
 {{% content "marketplace-update-note-shortguide" %}}
-
-## Next Steps
-
-- Register a domain name and [create a DNS record](/docs/products/networking/dns-manager/) for it using the Linode Cloud Manager.
-- [Configure your Apache HTTP Server](/docs/guides/how-to-install-a-lamp-stack-on-debian-10/#configure-name-based-virtual-hosts) to point to your domain name.

docs/guides/uptime/loadbalancing/how-to-configure-haproxy-http-load-balancing-and-health-checks/2024-Default-WordPress-Homepage-backend1.png

@@ -27,7 +27,7 @@ A LAMP (Linux, [Apache](https://www.apache.org), [MySQL](https://www.mysql.com),
 
 ## Configuration Options
 
-- **Supported distributions:** Ubuntu 22.04 LTS
+- **Supported distributions:** Ubuntu 24.04 LTS
 - **Recommended minimum plan:** 1GB Shared Compute Instance or higher, depending on the number of sites and size of the sites you plan on hosting.
 
 ### LAMP Stack Options