Skip to content

Commit

Permalink
Changed version to condition and adjusted DC files for Cockpit guide.
Browse files Browse the repository at this point in the history
  • Loading branch information
lvicoun committed Apr 16, 2024
1 parent b3a0dd3 commit 16d61c7
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 43 deletions.
2 changes: 1 addition & 1 deletion DC-Micro-5.4-cockpit
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRC_DIR="articles"

## Profiling
PROFOS="slemicro"
PROFVERSION="5.4"
PROFCONDITION="5.4"
STRUCID="slemicro-cockpit-54"
#PROFARCH="x86_64;zseries;power;aarch64"

Expand Down
2 changes: 1 addition & 1 deletion DC-Micro-5.5-cockpit
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRC_DIR="articles"

## Profiling
PROFOS="slemicro"
PROFVERSION="5.5"
PROFCONDITION="5.5"
STRUCID="slemicro-cockpit-55-further"
#PROFARCH="x86_64;zseries;power;aarch64"

Expand Down
2 changes: 1 addition & 1 deletion DC-Micro-6.0-cockpit
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRC_DIR="articles"

## Profiling
PROFOS="slmicro"
PROFVERSION="6.0"
PROFCONDITION="6.0"
STRUCID="slemicro-cockpit-55-further"
#PROFARCH="x86_64;zseries;power;aarch64"

Expand Down
6 changes: 3 additions & 3 deletions articles/SLE-Micro-public-cloud.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
</meta>
<!-- enter product name and version -->
<meta name="productname" its:translate="no">
<productname version="5.4" os="slemicro">&productname;</productname>
<productname version="5.5" os="slemicro">&productname;</productname>
<productname version="6.0" os="slmicro">&productname;</productname>
<productname condition="5.4" os="slemicro">&productname;</productname>
<productname condition="5.5" os="slemicro">&productname;</productname>
<productname condition="6.0" os="slmicro">&productname;</productname>
</meta>
<!-- SEO and social media -->
<meta name="title" its:translate="yes">Deploying SLE Micro in Public Clouds</meta>
Expand Down
4 changes: 2 additions & 2 deletions articles/SLE_Micro_admin.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
<phrase>&power;</phrase>
</meta>
<meta name="productname" its:translate="no">
<productname version="5.4" os="slemicro">&productname;</productname>
<productname version="5.5" os="slmicro">&productname;</productname>
<productname condition="5.4" os="slemicro">&productname;</productname>
<productname condition="5.5" os="slmicro">&productname;</productname>
</meta>
<meta name="title" its:translate="yes">Administration of &productnameshort;</meta>
<meta name="description" its:translate="yes">Describes the administration tasks on &productnameshort;</meta>
Expand Down
6 changes: 3 additions & 3 deletions articles/cockpit-slemicro.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ type="application/relax-ng-compact-syntax"?>
</meta>
<!-- enter product name and version -->
<meta name="productname" its:translate="no">
<productname version="5.5" os="slemicro">&productname;</productname>
<productname version="6.0" os="slmicro">&productname;</productname>
<productname condition="5.5" os="slemicro">&productname;</productname>
<productname condition="6.0" os="slmicro">&productname;</productname>
</meta>
<!-- SEO and social media -->
<meta name="title">Administering &productnameshort; using &cockpit;</meta>
Expand Down Expand Up @@ -532,7 +532,7 @@ type="application/relax-ng-compact-syntax"?>
</meta>
<!-- enter product name and version -->
<meta name="productname" its:translate="no">
<productname version="5.4" os="slemicro">&productname;</productname>
<productname condition="5.4" os="slemicro">&productname;</productname>
</meta>
<!-- SEO and social media -->
<meta name="title">Administering &productnameshort; using &cockpit;</meta>
Expand Down
2 changes: 1 addition & 1 deletion articles/deployment-selfinstall-images-bare-metal.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
identifiers, separated by ; -->
<meta name="architecture" content="x86;power" its:translate="no"/>
<meta name="productname" its:translate="no">
<productname version="6.0" os="slmicro">&productname;</productname>
<productname condition="6.0" os="slmicro">&productname;</productname>
</meta>
<meta name="title" its:translate="yes">Deploying &productnameshort; raw images</meta>
<meta name="description" its:translate="yes">The article covers the steps needed to deploy
Expand Down
3 changes: 1 addition & 2 deletions articles/security-slemicro.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@
<phrase>&power;</phrase>
</meta>
<meta name="productname" its:translate="no">
<productname version="5.4" os="slemicro">&productname;</productname>
<productname version="5.5" os="slemicro">&productname;</productname>
<productname condition="5.5" os="slemicro">&productname;</productname>
</meta>
<meta name="title" its:translate="yes">The SLE Micro security guide</meta>
<meta name="description" its:translate="yes">The article provides details regarding SELinux, PAM and keylime.</meta>
Expand Down
6 changes: 2 additions & 4 deletions articles/sudo-configure-superuser-privileges.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@
<phrase>&power;</phrase>
</meta>
<meta name="productname" its:translate="no">
<productname version="5.4">&productname;</productname>
<productname version="5.5">&productname;</productname>
<productname version="6.0">&productname;</productname>
<productname version="16.0" os="sles">&productname;</productname>
<productname condition="6.0">&productname;</productname>
<productname condition="16.0" os="sles">&productname;</productname>
</meta>
<meta name="title" its:translate="yes">Configuring superuser privileges
with &sudo;</meta>
Expand Down
6 changes: 2 additions & 4 deletions articles/sudo-run-commands-as-superuser.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,8 @@
<meta name="architecture" content="x86_64;zseries;power;aarch64"
its:translate="no"/>
<meta name="productname" its:translate="no">
<productname version="5.4">&productname;</productname>
<productname version="5.5">&productname;</productname>
<productname version="6.0">&productname;</productname>
<productname version="16.0" os="sles">&productname;</productname>
<productname condition="6.0">&productname;</productname>
<productname condition="16.0" os="sles">&productname;</productname>
</meta>
<meta name="title" its:translate="yes">Running commands as superuser
with &sudo;</meta>
Expand Down
6 changes: 2 additions & 4 deletions articles/systemd-basics.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,8 @@
<phrase>&power;</phrase>
</meta>
<meta name="productname" its:translate="no">
<productname version="16.0" os="sles">&productname;</productname>
<productname version="5.4" os="slemicro">&productname;</productname>
<productname version="5.5" os="slemicro">&productname;</productname>
<productname version="6.0" os="slmicro">&productname;</productname>
<productname condition="16.0" os="sles">&productname;</productname>
<productname condition="6.0" os="slmicro">&productname;</productname>
</meta>
<meta name="title" its:translate="yes">Managing &systemd; services</meta>
<meta name="description" its:translate="yes">Gives you an understanding and managing of &systemd; services.</meta>
Expand Down
6 changes: 2 additions & 4 deletions articles/systemd-timer-working-with.asm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@
</meta>
<!-- enter product name and version -->
<meta name="productname" its:translate="no">
<productname version="5.4" os="slemicro">&productname;</productname>
<productname version="5.5" os="slemicro">&productname;</productname>
<productname version="6.0" os="slmicro">&productname;</productname>
<productname version="16.0" os="sles">&productname;</productname>
<productname condition="6.0" os="slmicro">&productname;</productname>
<productname condition="16.0" os="sles">&productname;</productname>
</meta>
<!-- SEO and social media -->
<meta name="title" its:translate="yes">Working with &systemd; timers</meta>
Expand Down
26 changes: 13 additions & 13 deletions tasks/cockpit-managing-containers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
Navigate to the <guimenu>Podman containers</guimenu> page.
</para>
</step>
<step os="slemicro;slmicro" version="5.5;6.0">
<step os="slemicro;slmicro" condition="5.5;6.0">
<para>
In the <guimenu>Images</guimenu> view, click <guimenu>Show images</guimenu>.
</para>
</step>
<step os="slemicro;slmicro" version="5.5;6.0">
<step os="slemicro;slmicro" condition="5.5;6.0">
<para>
Click <guimenu>Create container</guimenu> next to the image you want to use.
</para>
</step>
<step os="slemicro" version="5.4">
<step os="slemicro" condition="5.4">
<para>Click the arrow button next to the container image you want to use.</para>
</step>
<step>
Expand All @@ -67,7 +67,7 @@
In the <guimenu>Details</guimenu> tab, enter the following details:
</para>
<variablelist>
<varlistentry os="slemicro;slmicro" version="5.5;6.0">
<varlistentry os="slemicro;slmicro" condition="5.5;6.0">
<term>Owner</term>
<listitem>
<para>
Expand All @@ -83,7 +83,7 @@
</para>
</listitem>
</varlistentry>
<varlistentry os="slemicro;slmicro" version="5.5;6.0">
<varlistentry os="slemicro;slmicro" condition="5.5;6.0">
<term>Pull the latest image</term>
<listitem>
<para>
Expand Down Expand Up @@ -133,15 +133,15 @@
</para>
</listitem>
</varlistentry>
<varlistentry os="slemicro;slmicro" version="5.5;6.0">
<varlistentry os="slemicro;slmicro" condition="5.5;6.0">
<term>Restart policy</term>
<listitem>
<para>
Specify when the container is restarted after it exits.
</para>
</listitem>
</varlistentry>
<varlistentry os="slemicro" version="5.4">
<varlistentry os="slemicro" condition="5.4">
<term>Port mapping</term>
<listitem>
<para>
Expand Down Expand Up @@ -169,10 +169,10 @@
</listitem>
</varlistentry>
</variablelist>
<para os="slemicro;slmicro" version="5.5;6.0">
<para os="slemicro;slmicro" condition="5.5;6.0">
In the <guimenu>Integration</guimenu> tab, you can enter the following parameters:
</para>
<variablelist os="slemicro;slmicro" version="5.5;6.0">
<variablelist os="slemicro;slmicro" condition="5.5;6.0">
<varlistentry>
<term>Port mapping</term>
<listitem>
Expand Down Expand Up @@ -201,10 +201,10 @@
</listitem>
</varlistentry>
</variablelist>
<para os="slemicro;slmicro" version="5.5;6.0">
<para os="slemicro;slmicro" condition="5.5;6.0">
In the <guimenu>Health check</guimenu> tab, you can set a time period of commands triggering to check the status of the container. Fill in the following parameters:
</para>
<variablelist os="slemicro;slmicro" version="5.5;6.0">
<variablelist os="slemicro;slmicro" condition="5.5;6.0">
<varlistentry>
<term>Command</term>
<listitem>
Expand Down Expand Up @@ -255,12 +255,12 @@
</varlistentry>
</variablelist>
</step>
<step os="slemicro;slmicro" version="5.5;6.0">
<step os="slemicro;slmicro" condition="5.5;6.0">
<para>
To create the container, click <guimenu>Create</guimenu> or <guimenu>Create and run</guimenu> to create and start the container.
</para>
</step>
<step os="slemicro" version="5,4">
<step os="slemicro" condition="5.4">
<para>
To create the container, click <guimenu>Run</guimenu>.
</para>
Expand Down

0 comments on commit 16d61c7

Please sign in to comment.