NMS-19455: Restructuring Debian/Ubuntu, CentOS/RHEL docs

docs/modules/deployment/pages/core/centos/adoptium.adoc

@@ -0,0 +1,18 @@
+.Add Adoptium repository. See official https://adoptium.net/installation[docs] for more information.
+[source, console]
+----
+sudo bash -c 'cat <<EOF > /etc/yum.repos.d/adoptium.repo
+[Adoptium]
+name=Adoptium
+baseurl=https://packages.adoptium.net/artifactory/rpm/${DISTRIBUTION_NAME:-$(. /etc/os-release; echo $ID)}/\$releasever/\$basearch
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
+EOF'
+----
+
+.Install Temurin Java {compatible-javajdk}
+[source, console, subs="attributes"]
+----
+sudo dnf install temurin-{compatible-javajdk}-jdk
+----

docs/modules/deployment/pages/core/centos9/install-core.adoc → docs/modules/deployment/pages/core/centos/install-core.adoc

@@ -1,9 +1,13 @@
 ifeval::["{page-component-title}" == "Horizon"]
-include::../../repos/rhel-centos/horizon-rhel9.adoc[]
+include::../centos/adoptium.adoc[]
+endif::[]
+
+ifeval::["{page-component-title}" == "Horizon"]
+include::../centos/repo-horizon.adoc[]
 endif::[]
 
 ifeval::["{page-component-title}" == "Meridian"]
-include::../../repos/rhel-centos/meridian-rhel9.adoc[]
+include::../centos/repo-meridian.adoc[]
 endif::[]
 
 .Install {page-component-title} with all built-in dependencies

docs/modules/deployment/pages/core/centos/install-postgresql.adoc

@@ -0,0 +1,23 @@
+.Install language packs and set language
+[source,console]
+----
+sudo dnf install langpacks-en glibc-all-langpacks -y
+sudo localectl set-locale LANG=en_US.UTF-8
+sudo localectl
+sudo dnf makecache
+sudo dnf update -y
+----
+
+.Install PostgreSQL
+[source, console]
+[subs="verbatim,attributes"]
+----
+sudo dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-10-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+sudo dnf -qy module disable postgresql
+sudo dnf install -y postgresql{postgresql-version}-server
+sudo /usr/pgsql-{postgresql-version}/bin/postgresql-{postgresql-version}-setup initdb
+sudo systemctl enable postgresql-{postgresql-version}
+sudo systemctl start postgresql-{postgresql-version}
+----
+
+include::../general/initialize-postgresql.adoc[]

docs/modules/deployment/pages/core/centos/repo-horizon.adoc

@@ -0,0 +1,10 @@
+.Add repository and import GPG key
+[source, console]
+----
+sudo dnf -y install https://yum.opennms.org/repofiles/opennms-repo-stable-rhel9.noarch.rpm
+----
+NOTE: This is a workaround until https://opennms.atlassian.net/browse/NMS-19071[NMS-19071]  is solved.
+[source, console]
+----
+sudo sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/opennms-repo-stable-rhel9.repo
+----

docs/modules/deployment/pages/core/debian-ubuntu/adoptium.adoc

@@ -0,0 +1,13 @@
+.Add Adoptium repository. See official https://adoptium.net/installation/linux#deb-installation-on-debian-or-ubuntu[docs] for more information.
+[source, console]
+----
+sudo wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null
+sudo echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | sudo tee /etc/apt/sources.list.d/adoptium.list
+sudo apt update
+----
+
+.Install Temurin Java {compatible-javajdk}
+[source, console, subs="attributes"]
+----
+sudo apt -y install temurin-{compatible-javajdk}-jdk
+----

docs/modules/deployment/pages/core/ubuntu/install-core.adoc → docs/modules/deployment/pages/core/debian-ubuntu/install-core.adoc

@@ -1,6 +1,9 @@
-.Add OpenNMS repository GPG key
+include::../debian-ubuntu/adoptium.adoc[]
+
+.Install GnuPG and add OpenNMS repository GPG key
 [source, console]
 ----
+sudo apt -y install curl gnupg ca-certificates
 curl -fsSL https://debian.opennms.org/OPENNMS-GPG-KEY | sudo gpg --dearmor -o /usr/share/keyrings/opennms.gpg
 ----
 
@@ -13,15 +16,15 @@ sudo apt update
 
 NOTE: You can safely ignore the message about conflicting distributions (expected stable but got opennms-xx).
 
-.Install OpenNMS {page-component-title} with built-in dependencies (optional)
+.Install OpenNMS {page-component-title} with built-in dependencies
 [source, console]
 ----
 sudo apt -y install opennms
 ----
 
 TIP: Disable the OpenNMS {page-component-title} repository after installation to prevent unwanted upgrades when upgrading other packages on the server.
      After upgrade, {page-component-title} requires manual steps to upgrade configuration files or migrate database schemas to a new version.
-     We recommend that you exclude the {page-component-title} packages from update except when you are planning on performing an upgrade.
+     We recommend that you exclude the {page-component-title} packages from update except when you plan perform an upgrade.
 
 [source, console]
 ----

docs/modules/deployment/pages/core/debian-ubuntu/install-postgresql.adoc

@@ -0,0 +1,9 @@
+.Install PostgreSQL client and server
+[source, console]
+----
+sudo apt install -y postgresql-common
+sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh
+sudo apt -y install postgresql-{postgresql-version}
+----
+
+include::../general/initialize-postgresql.adoc[]

docs/modules/deployment/pages/core/centos9/postgresql.adoc → docs/modules/deployment/pages/core/general/initialize-postgresql.adoc

@@ -1,25 +1,3 @@
-.Install language packs and set language
-[source,console]
-----
-sudo dnf install langpacks-en glibc-all-langpacks -y
-sudo localectl set-locale LANG=en_US.UTF-8
-sudo localectl
-sudo dnf makecache
-sudo dnf update -y
-----
-
-.Install PostgreSQL
-[source, console]
-[subs="verbatim,attributes"]
-----
-sudo dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm
-sudo dnf -qy module disable postgresql
-sudo dnf install -y postgresql{postgresql-version}-server
-sudo /usr/pgsql-{postgresql-version}/bin/postgresql-{postgresql-version}-setup initdb
-sudo systemctl enable postgresql-{postgresql-version}
-sudo systemctl start postgresql-{postgresql-version}
-----
-
 IMPORTANT: You must provide a secure password for the `opennms` database user account.
 This guide uses `YOUR-OPENNMS-PASSWORD` as a placeholder.
 

docs/modules/deployment/pages/core/install.adoc

@@ -1,7 +1,7 @@
 
 [[getting-started-core]]
 = Installation and Configuration
-:description: Install and configure OpenNMS instance including PostgreSQL setup on CentOS/RHEL 9, Debian/Ubuntu, and Docker.
+:description: Install and configure OpenNMS instance including PostgreSQL setup on CentOS/RHEL 9/10, Debian/Ubuntu, and Docker.
 
 This section explains how to install and configure a new {page-component-title} instance, including the following tasks:
 
@@ -82,17 +82,17 @@ Use it at your own discretion.
 
 [{tabs}]
 ====
-CentOS 9::
+CentOS/RHEL 9/10::
 +
 --
-include::centos9/postgresql.adoc[]
+include::centos/install-postgresql.adoc[]
 --
 ifeval::["{page-component-title}" == "Horizon"]
 
 Debian/Ubuntu::
 +
 --
-include::debian-ubuntu/postgresql.adoc[]
+include::debian-ubuntu/install-postgresql.adoc[]
 --
 
 Docker::
@@ -111,23 +111,17 @@ Do not expose the web console or sign-in pages directly to the Internet without
 
 [{tabs}]
 ====
-CentOS 9::
+CentOS/RHEL 9/10::
 +
 --
-include::centos9/install-core.adoc[]
+include::centos/install-core.adoc[]
 --
 ifeval::["{page-component-title}" == "Horizon"]
 
-Ubuntu::
-+
---
-include::ubuntu/install-core.adoc[]
---
-
-Debian::
+Debian/Ubuntu::
 +
 --
-include::debian/install-core.adoc[]
+include::debian-ubuntu/install-core.adoc[]
 --
 
 Docker::
@@ -143,7 +137,7 @@ endif::[]
 
 [{tabs}]
 ====
-CentOS 9::
+CentOS/RHEL 9/10::
 +
 --
 include::centos/initialize-core.adoc[]

docs/modules/deployment/pages/minion/centos-rhel9/install-minion.adoc

@@ -5,11 +5,11 @@ sudo dnf -y install java-17-openjdk-headless
 ----
 
 ifeval::["{page-component-title}" == "Horizon"]
-include::../../repos/rhel-centos/horizon-rhel9.adoc[]
+include::../../core/centos/repo-horizon.adoc[]
 endif::[]
 
 ifeval::["{page-component-title}" == "Meridian"]
-include::../../repos/rhel-centos/meridian-rhel9.adoc[]
+include::../../core/centos/repo-meridian.adoc[]
 endif::[]
 
 .Install the {page-component-title} Minion package