From 49d7c9682d25c5415c84be4778b87eb28e1265a2 Mon Sep 17 00:00:00 2001
From: Nicolas Charles <nicolas.charles@normation.com>
Date: Mon, 18 Jul 2022 11:28:01 +0200
Subject: [PATCH] Fixes #21420: Installation documentation for Server has a
 section about sles12 but we only support sles15 as of 7.0

---
 .../{sles_repo.adoc => sles12_repo.adoc}      | 24 ---------------
 .../pages/_partials/sles15_repo.adoc          | 29 +++++++++++++++++++
 .../installation/pages/agent/sles.adoc        |  6 +++-
 .../installation/pages/relay/sles.adoc        |  6 ++--
 .../installation/pages/server/sles.adoc       |  6 ++--
 .../installation/pages/upgrade/sles.adoc      |  6 +++-
 6 files changed, 45 insertions(+), 32 deletions(-)
 rename src/reference/modules/installation/pages/_partials/{sles_repo.adoc => sles12_repo.adoc} (54%)
 create mode 100644 src/reference/modules/installation/pages/_partials/sles15_repo.adoc

diff --git a/src/reference/modules/installation/pages/_partials/sles_repo.adoc b/src/reference/modules/installation/pages/_partials/sles12_repo.adoc
similarity index 54%
rename from src/reference/modules/installation/pages/_partials/sles_repo.adoc
rename to src/reference/modules/installation/pages/_partials/sles12_repo.adoc
index 5d09f833..2795868c 100644
--- a/src/reference/modules/installation/pages/_partials/sles_repo.adoc
+++ b/src/reference/modules/installation/pages/_partials/sles12_repo.adoc
@@ -1,27 +1,3 @@
-Add the Rudder packages repository:
-
-* on SLES 15:
-
-----
-
-zypper ar -n 'Rudder 7.0' http://repository.rudder.io/rpm/7.0/SLES_15/ Rudder
-
-----
-
-[NOTE]
-====
-
-If you have an active subscription, use the following to get access to long term support (you need to replace
-the user name and the password by your Rudder account):
-
-----
-
-zypper ar -n 'Rudder 7.0' https://LOGIN:PASSWORD@download.rudder.io/rpm/7.0/SLES_15/ Rudder
-
-----
-
-====
-
 * on SLES 12:
 
 ----
diff --git a/src/reference/modules/installation/pages/_partials/sles15_repo.adoc b/src/reference/modules/installation/pages/_partials/sles15_repo.adoc
new file mode 100644
index 00000000..e651cd3f
--- /dev/null
+++ b/src/reference/modules/installation/pages/_partials/sles15_repo.adoc
@@ -0,0 +1,29 @@
+* on SLES 15:
+
+----
+
+zypper ar -n 'Rudder 7.0' http://repository.rudder.io/rpm/7.0/SLES_15/ Rudder
+
+----
+
+[NOTE]
+====
+
+If you have an active subscription, use the following to get access to long term support (you need to replace
+the user name and the password by your Rudder account):
+
+----
+
+zypper ar -n 'Rudder 7.0' https://LOGIN:PASSWORD@download.rudder.io/rpm/7.0/SLES_15/ Rudder
+
+----
+
+====
+
+Update your local package database to retrieve the list of packages available on our repository:
+
+----
+
+zypper refresh
+
+----
diff --git a/src/reference/modules/installation/pages/agent/sles.adoc b/src/reference/modules/installation/pages/agent/sles.adoc
index 15e7bcd3..d85cf9bf 100644
--- a/src/reference/modules/installation/pages/agent/sles.adoc
+++ b/src/reference/modules/installation/pages/agent/sles.adoc
@@ -6,7 +6,11 @@ include::{partialsdir}/zypper_segfault.adoc[]
 
 include::{partialsdir}/rpm_key.adoc[]
 
-include::{partialsdir}/sles_repo.adoc[]
+Add the Rudder packages repository:
+
+include::{partialsdir}/sles15_repo.adoc[]
+
+include::{partialsdir}/sles12_repo.adoc[]
 
 Install the package:
 
diff --git a/src/reference/modules/installation/pages/relay/sles.adoc b/src/reference/modules/installation/pages/relay/sles.adoc
index 29917f37..9f6e641c 100644
--- a/src/reference/modules/installation/pages/relay/sles.adoc
+++ b/src/reference/modules/installation/pages/relay/sles.adoc
@@ -2,11 +2,11 @@
 
 include::{partialsdir}/relay_plugin.adoc[]
 
-include::{partialsdir}/zypper_segfault.adoc[]
-
 include::{partialsdir}/rpm_key.adoc[]
 
-include::{partialsdir}/sles_repo.adoc[]
+Add the Rudder packages repository:
+
+include::{partialsdir}/sles15_repo.adoc[]
 
 Install the package:
 
diff --git a/src/reference/modules/installation/pages/server/sles.adoc b/src/reference/modules/installation/pages/server/sles.adoc
index bd1ec5bb..7c366915 100644
--- a/src/reference/modules/installation/pages/server/sles.adoc
+++ b/src/reference/modules/installation/pages/server/sles.adoc
@@ -7,8 +7,6 @@ include::{partialsdir}/server_notes.adoc[]
 
 == Configure the package manager
 
-include::{partialsdir}/zypper_segfault.adoc[]
-
 [WARNING]
 
 ====
@@ -25,7 +23,9 @@ not be resolved and asks what to do.
 
 include::{partialsdir}/rpm_key.adoc[]
 
-include::{partialsdir}/sles_repo.adoc[]
+Add the Rudder packages repository:
+
+include::{partialsdir}/sles15_repo.adoc[]
 
 == Install Rudder root server
 
diff --git a/src/reference/modules/installation/pages/upgrade/sles.adoc b/src/reference/modules/installation/pages/upgrade/sles.adoc
index bf68878a..44e0b8ae 100644
--- a/src/reference/modules/installation/pages/upgrade/sles.adoc
+++ b/src/reference/modules/installation/pages/upgrade/sles.adoc
@@ -2,7 +2,11 @@
 
 include::{partialsdir}/upgrade_notes.adoc[]
 
-include::{partialsdir}/sles_repo.adoc[]
+Add the Rudder packages repository:
+
+include::{partialsdir}/sles15_repo.adoc[]
+
+include::{partialsdir}/sles12_repo.adoc[]
 
 == Rudder agent