Merge branch 'branches/rudder/7.1' into branches/rudder/7.2

amousset · Aug 31, 2022 · d49961f · d49961f
2 parents 189931f + c0ebb4b
commit d49961f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 32 deletions.
diff --git a/...stallation/pages/_partials/sles_repo.adoc → ...allation/pages/_partials/sles12_repo.adoc b/...stallation/pages/_partials/sles_repo.adoc → ...allation/pages/_partials/sles12_repo.adoc
@@ -1,27 +1,3 @@
-Add the Rudder packages repository:
-
-* on SLES 15:
-
-----
-
-zypper ar -n 'Rudder 7.2' http://repository.rudder.io/rpm/7.2/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.2' https://LOGIN:PASSWORD@download.rudder.io/rpm/7.2/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
@@ -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
@@ -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
@@ -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
@@ -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 server
 

diff --git 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