Merge branch 'manager-5.1' into 1250451-51-displayEntries

Author: 0rnela

CHANGELOG.md

@@ -1,5 +1,7 @@
 - Improved the appearance of Web UI instructions in Administration
   Guide (bsc#1250451)
+- Improved example for proxy bootstrap script in Client Configuration 
+  Guide (bsc#1251117)
 - Added new workflow for liberating RHEL server in Common Workflows 
   Guides (bsc#1250423)
 - Fixed the broken link in Specialized Guides (bsc#1249073)

modules/administration/pages/image-management.adoc

@@ -29,10 +29,16 @@ The Kiwi build type is used to build system, virtual, and other images.
 // Needs checking
 // at later places to be fix accordingly
 The image store for the Kiwi build type is pre-defined as a file system directory in the [path]``srv-www`` volume.
-{productname} serves the image store over HTTPS from [literal]``https://<SERVER-FQDN>/os-images/``.
-The image store location is unique and is not customizable.
 
-Images are stored in an [path]``ORGANIZATION-ID`` directory there.
+ifeval::[{mlm-content} == true]
+The image files can be downloaded from [path]``https://MANAGER-HOST/os-images/ORGANIZATION-ID/FILE-NAME``.
+The exact location can be determined from the image details page.
+endif::[]
+
+ifeval::[{uyuni-content} == true]
+The image files can be downloaded from [path]``https://UYUNI-HOST/os-images/ORGANIZATION-ID/FILE-NAME``.
+The exact location can be determined from the image details page.
+endif::[]
 
 
 [[at.images.docker]]
@@ -630,13 +636,15 @@ By default, the image store is using the [path]``srv-www`` volume.
 ====
 Image stores for Kiwi build type, used to build system, virtual, and other images, are not supported yet.
 
-// FIXME
+
 ifeval::[{mlm-content} == true]
-Images are always stored in [path]``.../os-images/ORGANIZATION-ID`` and are accessible via HTTP/HTTPS [url]``https://<susemanager_host>/os-images/ORGANIZATION-ID``.
+The image files can be downloaded from [path]``https://MANAGER-HOST/os-images/ORGANIZATION-ID/FILE-NAME``.
+The exact location can be determined from the image details page.
 endif::[]
 
 ifeval::[{uyuni-content} == true]
-Images are always stored in [path]``.../os-images/ORGANIZATION-ID`` and are accessible via HTTP/HTTPS [url]``https://<uyuni_host>/os-images/ORGANIZATION-ID``.
+The image files can be downloaded from [path]``https://UYUNI-HOST/os-images/ORGANIZATION-ID/FILE-NAME``.
+The exact location can be determined from the image details page.
 endif::[]
 
 ====

modules/client-configuration/pages/registration-bootstrap.adoc

@@ -51,7 +51,7 @@ endif::[]
 
 
 [[registering.clients.bootstrap.mgr-bootstrap]]
-== Create a Bootstrap Script with [command]``mgr-bootstrap``
+== Create a bootstrap script with [command]``mgr-bootstrap``
 
 The [command]``mgr-bootstrap`` command generates custom bootstrap scripts.
 A bootstrap script is used by {productname} client systems for simplifying their initial registration and configuration.
@@ -69,10 +69,24 @@ The [command]``mgr-bootstrap`` command offers several other options, including t
 [NOTE]
 ====
 
-If users wish to create a bootstrap script to register against the Proxy, they can do so using the following command from the Server container:
+* If you wish to create a bootstrap script to register against the Proxy, you can do so by using the following command from the Server container:
+
++ 
 
 ----
-mgr-boostrap --hostname $proxyfqdn
+mgr-boostrap --hostname <PROXY_FQDN>
+----
+
++ 
+
+This command will create a new bootstrap script with default name [literal]``bootstrap.sh`` and it will overwrite the existing [literal]``bootstrap.sh`` file which is used for the Server.
+
+* To specify a different script, use the following comamnd:
+
++
+
+----
+mgr-bootstrap --hostname <PROXY_FQDN> --script=boostrap-<PROXY-SCRIPT>.sh
 ----
 
 ====
@@ -81,25 +95,35 @@ For more information, see the [literal]``mgr-bootstrap`` man page, or run [comma
 
 
 
-== Create a Bootstrap Script from {webui}
+== Create a bootstrap script from {webui}
 
 You can use the {productname} {webui} to create an editable bootstrap script.
 
 // 2022-10-26, ke: In step 2, check whether we can use {productname} macro.
 
-.Procedure: Creating a Bootstrap Script
+.Procedure: Creating a bootstrap script
+[role=procedure]
+_____
+
 . In the {productname} {webui}, navigate to menu:Admin[Manager Configuration > Bootstrap Script].
+
 . The required fields are pre-populated with values derived from previous installation steps.
   For details on each setting, see xref:reference:admin/bootstrap-script.adoc[].
+
 . Click btn:[Update] to create the script.
+
 . The bootstrap script is generated and stored on the server in the [path]``/srv/www/htdocs/pub/bootstrap`` directory.
   Alternatively, you can access the bootstrap script over HTTPS.
   Replace [literal]``<example.com>`` with the host name of your {productname} Server:
+
 +
+
 ----
 https://<example.com>/pub/bootstrap/bootstrap.sh
 ----
 
+_____
+
 
 [IMPORTANT]
 ====
@@ -113,7 +137,7 @@ For more information about custom certificates, see xref:administration:ssl-cert
 
 
 [[modify.bootstrap.script]]
-== Edit a Bootstrap Script
+== Edit a bootstrap script
 
 You can copy and modify the template bootstrap script you created to customize it.
 A minimal requirement when modifying a bootstrap script for use with {productname} is the inclusion of an activation key.
@@ -127,24 +151,36 @@ For more information about activation keys, see xref:client-configuration:activa
 
 
 
-.Procedure: Modifying a Bootstrap Script
+.Procedure: Modifying a bootstrap script
+[role=procedure]
+_____
+
+
 . On your {productname} Server, as root at the command line change to the bootstrap directory with:
+
 +
+
 ----
 cd /srv/www/htdocs/pub/bootstrap/
 ----
+
 . Create and rename two copies of the template bootstrap script for use with each of your clients.
+
 +
+
 ----
 cp bootstrap.sh bootstrap-sles12.sh
 cp bootstrap.sh bootstrap-sles15.sh
 ----
+
 . Open [path]``bootstrap-sles15.sh`` for modification.
     Scroll down until you can see the text shown below.
     If ``exit 1`` exists in the file, comment it out by typing a hash or pound sign  (&#35;) at the beginning of the line.
     This activates the script.
     Enter the name of the key for this script in the ``ACTIVATION_KEYS=`` field:
+
 +
+
 ----
 echo "Enable this script: comment (with #'s) this block (or, at least just"
 echo "the exit below)"
@@ -157,6 +193,8 @@ ACTIVATION_KEYS=1-sles15
 ORG_GPG_KEY=
 ----
 
++
+
 [NOTE]
 ====
 Instead of editing the script manually, user can pass the following environment variables at runtime:
@@ -169,8 +207,12 @@ Instead of editing the script manually, user can pass the following environment
 Using environment variables allows dynamic input at runtime and makes it easier to reuse the same bootstrap script across different systems or environments.
 ====
 
++
+
 . When you have finished, save the file, and repeat this procedure for the second bootstrap script.
 
+_____
+
 [NOTE]
 ====
 By default, bootstrap script will try to install [package]``venv-salt-minion`` if it is available in the bootstrap repository and [package]``salt-minion`` if there is no {salt} bundle in the bootstrap repository.
@@ -182,45 +224,58 @@ For more information, see xref:client-configuration:contact-methods-saltbundle.a
 
 
 [[registering.clients.bootstrap.register]]
-== Register Clients Running the Bootstrap Script
+== Register clients running the bootstrap script
 
 When you have finished creating your script, you can use it to register clients.
 
 
-.Procedure: Running the Bootstrap Script
+.Procedure: Running the bootstrap script
+[role=procedure]
+_____
 
 . On the {productname} Server, log in as root.
   At the command prompt, and change to the bootstrap directory:
+
 +
 
 ----
 cd /srv/www/htdocs/pub/bootstrap/
 ----
+
 +
 
 . Run this command to execute the bootstrap script on the client; replace [systemitem]``EXAMPLE.COM`` with the host name of your client:
+
 +
 
 ----
 cat bootstrap-sles15.sh | ssh [email protected] /bin/bash
 ----
+
 +
 
 . Alternatively, on the client, run this command:
+
 +
+
 ----
 ACTIVATION_KEYS="17-someactivationkey" \
 MGR_SERVER_HOSTNAME="proxy.example.com" \
 ORG_GPG_KEY="mykey" \
 REACTIVATION_KEY=my-reactivation-key \
 curl -Sks https://server_hostname/pub/bootstrap/bootstrap.sh | /bin/bash
 ----
+
 +
+
 If you do not need to override any values, you can omit the environment variables entirely:
+
 +
+
 ----
 curl -Sks https://server_hostname/pub/bootstrap/bootstrap.sh | /bin/bash
 ----
+
 +
 
 [IMPORTANT]
@@ -230,12 +285,15 @@ To avoid problems, make sure the bootstrap script is executed using [command]``b
 +
 
 This script downloads the required dependencies located in the repositories directory you created earlier.
+
 +
 
 . When the script has finished running, you can check that the client is registered correctly.
   Open the {productname} {webui} and navigate to menu:Systems[Overview] to ensure the new client is listed.
   If the client is not listed, in the {productname} {webui} navigate to menu:Salt[Keys] and check whether the client key is accepted.
 
+_____
+
 [WARNING]
 ====
 When new packages or updates are installed on the client using {productname}, any end user license agreements (EULAs) are automatically accepted.