Skip to content

Commit

Permalink
Merge branch 'maintenance/SLE15SP3' into maintenance/SLE_Micro_5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lvicoun committed Jul 31, 2023
2 parents c119284 + 5111ebc commit 4636531
Show file tree
Hide file tree
Showing 11 changed files with 115 additions and 81 deletions.
2 changes: 1 addition & 1 deletion doc-kit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ file: c6b4745307e90c9b88905b434cbbaddc54e4541b .editorconfig
file: 47e64cba1ddfdfa57fec4da6591e7259ac38afb5 xml/generic-entities.ent
file: a79a3bc929478668955564bab48aecc8502555f6 xml/network-entities.ent
file: 877a69c29d30bd89aa36d79dd96c72dbde4a0ed8 xml/common_intro_available_doc.xml
file: 2024e3be75c45cf26a2b076eee30c697a6e819a1 xml/common_intro_support.xml
file: 6b82b8fa32f3c8cd8c76e804e420ae4a9312ec27 xml/common_intro_support.xml
file: 578bc097d6cb4ef8aa08dbf4f1bf4400cae124f6 xml/common_intro_convention.xml
file: fcb8648dbfbe5a036547347e2affbeb353622162 xml/common_intro_feedback.xml
file: 1c8497ffe563b59832de4b0e106082aa4932a528 xml/common_copyright_gfdl.xml
Expand Down
16 changes: 13 additions & 3 deletions xml/art_installation-sleds.xml
Original file line number Diff line number Diff line change
Expand Up @@ -896,10 +896,20 @@ disk:
</term>
<listitem>
<para>
Displays the current network configuration. Click
<guimenu>Network Configuration</guimenu> to change the settings. For
details, see <xref linkend="sec-network-yast"/>.
Displays the current network configuration. By default, <command>wicked</command> is used
for server installations and &nm; for desktop workloads. Click
<guimenu>Network Configuration</guimenu> to change the settings. For details, see
<xref linkend="sec-network-yast"/>.
</para>
<important os="sles">
<title>Support for &nm;</title>
<para>
&suse; only supports &nm; for desktop workloads with &sleda; or the Workstation extension.
All server certifications are done with <command>wicked</command> as the network
configuration tool, and using &nm; may invalidate them. &nm; is not supported by &suse; for
server workloads.
</para>
</important>
</listitem>
</varlistentry>
<varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion xml/art_jeos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
The &kiwi; configuration files used to create the official &jeos; images
are available from the openSUSE Build Service at
<link
xlink:href="https://build.opensuse.org/package/view_file/SUSE:SLE-15-SP1:GA/kiwi-templates-SLES15-&jeos;/&jeos;.kiwi?expand=1">https://build.opensuse.org/</link>.
xlink:href="https://build.opensuse.org/package/view_file/SUSE:SLE-15-SP3:Update/kiwi-templates-JeOS/JeOS.kiwi?expand=1">https://build.opensuse.org/</link>.
</para>
<note>
<title>Specific host tools packages</title>
Expand Down
4 changes: 2 additions & 2 deletions xml/common_intro_support.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<title>Support statement for &productname;</title>
<para>
To receive support, you need an appropriate subscription with &suse;.
To view the specific support offerings available to you, go to
To view the specific support offers available to you, go to
<link xlink:href="https://www.suse.com/support/"/> and select your product.
</para>
<para>
Expand All @@ -59,7 +59,7 @@
<listitem>
<para>
Problem isolation, which means technical support designed to analyze
data, reproduce customer problems, isolate problem area and provide a
data, reproduce customer problems, isolate a problem area and provide a
resolution for problems not resolved by Level&nbsp;1 or prepare for
Level&nbsp;3.
</para>
Expand Down
26 changes: 18 additions & 8 deletions xml/deployment_yast_installer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2381,14 +2381,24 @@ sle-live-patching 8c541494</screen>
This category displays the current network settings, as automatically
configured after booting into the installation (see <xref
linkend="sec-yast-install-network" xrefstyle="select:label"/>) or as manually
configured from the <guimenu>Registration</guimenu> or
<guimenu>Add-On Product</guimenu> dialog during the respective steps of
the installation process. If you want to check or adjust the network settings
at this stage (before performing the installation), click
<guimenu>Network Configuration</guimenu>. This takes you to the &yast;
<guimenu>Network Settings</guimenu> module.<phrase os="sles;sled;osuse"> For details, see
<xref linkend="sec-network-yast"/>.</phrase>
</para>
configured during the installation process. <phrase os="sles;sled;osuse"></phrase>By default,
<command>wicked</command> is used for server installations and &nm; for desktop workloads.
</para>
<para>
If you want to check or adjust the network settings, click
<guimenu>Network Configuration</guimenu>. This takes you to the &yast;
<guimenu>Network Settings</guimenu> module.<phrase os="sles;sled;osuse"> For details, see
<xref linkend="sec-network-yast"/>.</phrase>
</para>
<important os="sles">
<title>Support for &nm;</title>
<para>
&suse; only supports &nm; for desktop workloads with &sleda; or the Workstation extension.
All server certifications are done with <command>wicked</command> as the network
configuration tool, and using &nm; may invalidate them. &nm; is not supported by &suse; for
server workloads.
</para>
</important>
</sect2>
<sect2 xml:id="sec-yast-install-proposal-kdump" os="sles;slemicro">
<title><guimenu>Kdump</guimenu></title>
Expand Down
7 changes: 2 additions & 5 deletions xml/net_teaming.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,9 @@
<title>General procedure</title>
<step>
<para>
Make sure you have all the necessary packages installed. Install the
packages
<package>libteam-tools</package>,
<package>libteamdctl0</package>, and
<package>python-libteam</package>.
Install the package <package>libteam-tools</package>:
</para>
<screen>&prompt.sudo;<command>zypper in libteam-tools</command></screen>
</step>
<step>
<para>
Expand Down
7 changes: 5 additions & 2 deletions xml/rmt_config_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,18 @@
<term><literal>proxy</literal></term>
<listitem>
<para>
The proxy server URL.
The proxy server URL including the protocol and the port number. For
example: <literal>http://proxy_url:8080</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>noproxy</literal></term>
<listitem>
<para>
A list of domains that should NOT go through the proxy, separated by commas. Example: "localhost,.mylocaldomain"
A list of domains that should <emphasis>not</emphasis> go through the
proxy, separated by commas. For example:
<literal>localhost,.mylocaldomain</literal>.
</para>
</listitem>
</varlistentry>
Expand Down
90 changes: 45 additions & 45 deletions xml/security_ldap_ca.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
%entities;
]>

<sect1 xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0"
<sect1 xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0"
xml:id="sec-security-ldap-server-ca">
<title>Importing TLS server certificates and keys</title>
<para>
You can manage your CA certificates and keys for &ds389; with the following
command line tools: <command>certutil</command>, <command>openssl</command>, and
You can manage your CA certificates and keys for &ds389; with the following
command line tools: <command>certutil</command>, <command>openssl</command>, and
<command>pk12util</command>.
</para>
<para>
Expand All @@ -23,63 +23,63 @@
<filename>/etc/dirsrv/slapd-<replaceable>INSTANCE-NAME</replaceable>/ca.crt</filename>.
</para>
<para>
For production environments, it is a best practice to use a third-party
certificate authority, such as Let's Encrypt, CAcert.org, SSL.com, or
whatever CA you choose. Request a server certificate, a client
For production environments, it is a best practice to use a third-party
certificate authority, such as Let's Encrypt, CAcert.org, SSL.com, or
whatever CA you choose. Request a server certificate, a client
certificate, and a root certificate.
</para>
<procedure>
<para>
Before you can import an existing private key and certificate into the NSS
database, you need to create a bundle of the private key and the server
certificate. This results in a <filename>*.p12</filename>
file.
</para>
<important>
<title><filename>*.p12</filename> file and friendly name</title>
<para>
When creating the PKCS12 bundle, you must encode <literal>Server-Cert</literal>
as the friendly name in the <filename>*.p12</filename> file.
Otherwise the TLS connection will fail, because the &ds389; searches for
this exact string.
The Mozilla NSS (Network Security Services ) toolkit uses nicknames for certificates in the certificate store.
The server certificate uses the nickname <emphasis>Server-Cert</emphasis>.
</para>
<para>
The friendly name cannot be changed after you
import the <filename>*.p12</filename> file into the NSS
database.
</para>
</important>
</important>
<step>
<para>
Use the following command to create the PKCS12 bundle with the required friendly name:
Use the following commands to remove the Self-Signed-CA and Server-Cert from the instance:
</para>
<screen>&prompt.sudo;<command>openssl pkcs12 -export -in <replaceable>SERVER.crt</replaceable></command> \
<command>-inkey <replaceable>SERVER.key</replaceable></command> \
<command>-out <replaceable>SERVER.p12</replaceable> -name Server-Cert</command></screen>
<screen>&prompt.sudo;<command>dsctl <replaceable>INSTANCE_NAME</replaceable> tls remove-cert Self-Signed-CA</command>
&prompt.sudo;<command>dsctl <replaceable>INSTANCE_NAME</replaceable> tls remove-cert Server-Cert
</command>
</screen>

<para>
Replace <replaceable>SERVER.crt</replaceable> with the server certificate
and <replaceable>SERVER.key</replaceable> with the private key to be bundled.
Use <option>-out</option> to specify the name of the <filename>*.p12</filename>
file. Use <option>-name</option> to set the friendly name, which must be
<literal>Server-Cert</literal>.
Replace <replaceable>INSTANCE_NAME</replaceable> with the instance name of the directory server.
This is LDAP1 in the previous sections.
</para>
</step>
<step>
<para>
Before you can import the file into the NSS database, you need to
obtain its password. The password is stored in the
<filename>pwdfile.txt</filename> file in the
<filename>/etc/dirsrv/slapd-<replaceable>INSTANCE-NAME/</replaceable></filename> directory.
Import the CA that has signed your certificate.
</para>
<screen>&prompt.sudo;<command>sudo dsctl <replaceable>INSTANCE_NAME</replaceable> tls import-ca
/path/to/CA/in/PEM/format/CA.pem <replaceable>NICKNAME_FOR_CA</replaceable>
</command>
</screen>
<para>Replace <literal>INSTANCE_NAME</literal> with the instance name of the directory server.
Replace <literal>/path/to/CA/in/PEM/format/CA.pem</literal> with the full path to the CA certificate file in the PEM format.
Replace <literal>NICKNAME_FOR_CA </literal> with a nickname for the CA. </para>
</step>
<step>
<para>
Now import the <replaceable>SERVER.p12</replaceable> file
into your &ds389a; NSS database:
Import the server certificate and the key for the certificate.
</para>
<screen>&prompt.sudo;<command>dsctl <replaceable>INSTANCE_NAME</replaceable> tls remove-cert Self-Signed-CA</command>
&prompt.sudo;<command>pk12util -i <replaceable>SERVER.p12</replaceable> -d /etc/dirsrv/slapd-<replaceable>INSTANCE-NAME</replaceable>/cert9.db</command></screen>
</step>
<screen>&prompt.sudo;<command>dsctl <replaceable>INSTANCE_NAME</replaceable> tls import-server-key-cert
<replaceable>/path/to/SERVER.pem</replaceable> <replaceable>/path/to/SERVER.key</replaceable></command>
</screen>
<para> Replace <literal>INSTANCE_NAME</literal> with the instance name of the directory server.
Replace <literal>/path/to/SERVER.pem</literal> with the full path to the server certificate in PEM format.
Replace <literal>/path/to/SERVER.key</literal> with the full path to the server certificate key file in the PEM format.
</para>
</step>
<step>
<para>
Restart the instance so that the new certificates are used.
</para>
<screen>&prompt.sudo;<command>systemctl restart dirsrv@<replaceable>INSTANCE-NAME.</replaceable>.service
</command> </screen>
<para>Replace <literal>INSTANCE_NAME</literal> with the instance name of the directory server.</para>
</step>
</procedure>
</sect1>

8 changes: 4 additions & 4 deletions xml/security_ldap_install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ Instance "LDAP1" is running</screen>
<screen>&prompt.sudo;<command>dsctl <replaceable>LDAP1</replaceable> remove</command>
Not removing: if you are sure, add --do-it

&prompt.sudo;dsctl <command><replaceable>LDAP1</replaceable> remove --do-it</command></screen>
&prompt.sudo;<command>dsctl<replaceable>LDAP1</replaceable> remove --do-it</command></screen>
<para>
This command also removes partially installed or corrupted instances. You
can reliably create and remove instances as often as you want.
Expand All @@ -253,7 +253,7 @@ Not removing: if you are sure, add --do-it
If you forget the name of your instance, use <command>dsctl</command> to
list all instances:
</para>
<screen>&prompt.user;<command>dsctl -l</command>
<screen>&prompt.user;<command>sudo dsctl -l</command>
slapd-<replaceable>LDAP1</replaceable></screen>
</sect2>

Expand All @@ -271,13 +271,13 @@ slapd-<replaceable>LDAP1</replaceable></screen>
<para>
The following example prints the template to stdout:
</para>
<screen>&prompt.user;<command>dscreate create-template</command></screen>
<screen>&prompt.user;<command>sudo dscreate create-template</command></screen>
<para>
This is good for a quick review of the template, but you must create a file
to use in creating your new &ds389; instance. You can name this file
anything you want:
</para>
<screen>&prompt.user;<command>dscreate create-template <replaceable>TEMPLATE.txt</replaceable></command></screen>
<screen>&prompt.user;<command>sudo dscreate create-template <replaceable>TEMPLATE.txt</replaceable></command></screen>
<para>
This is a snippet from the new file:
</para>
Expand Down
16 changes: 8 additions & 8 deletions xml/selinux.xml
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,11 @@ system_u:object_r:var_t var</screen>
<para>
The policy is an essential component of &selnx;. &productname; &productnumber;
does <emphasis>not</emphasis> include a default policy, and you must build a
policy that is customized for your installation. &selnx; policies
should be customized for your particular needs; consult your &suse;
support engineer for assistance.
policy that is customized for your installation.
&selnx; policies should be customized for your particular needs. Contact &suse;
consulting services for assistance.
We recommend <literal>slemicro</literal> for customers and partners who are looking for a containerized or virtualized
host with full &selnx; support, including a supported policy.
</para>
<para>
For <emphasis>testing</emphasis> purposes you can obtain policies from
Expand Down Expand Up @@ -1028,14 +1030,12 @@ gen_context(system_u:object_r:httpd_modules_t,s0)</screen>
<screen>&prompt.sudo;<command>systemctl enable auditd</command></screen>

<para>
In
<xref linkend="ex-selnx-li-auditlog" xrefstyle="select:label quotedtitle nopage"/>
you can see a partial example of the contents of
<filename>/var/log/audit/audit.log</filename>
You can see a partial example of the contents of
<filename>/var/log/audit/audit.log</filename> below:
</para>

<example xml:id="ex-selnx-li-auditlog">
<title>Example lines from <filename>/etc/audit/audit.log</filename></title>
<title>Example lines from <filename>/var/log/audit/audit.log</filename></title>
<screen>type=DAEMON_START msg=audit(1348173810.874:6248): auditd start, ver=1.7.7 format=raw kernel=3.0.13-0.27-default auid=0 pid=4235 subj=system_u:system_r:auditd_t res=success
type=AVC msg=audit(1348173901.081:292): avc: denied { write } for pid=3426 comm="smartd" name="smartmontools" dev=sda6 ino=581743 scontext=system_u:system_r:fsdaemon_t tcontext=system_u:object_r:var_lib_t tclass=dir
type=AVC msg=audit(1348173901.081:293): avc: denied { remove_name } for pid=3426 comm="smartd" name="smartd.WDC_WD2500BEKT_75PVMT0-WD_WXC1A21E0454.ata.state~" dev=sda6 ino=582390 scontext=system_u:system_r:fsdaemon_t tcontext=system_u:object_r:var_lib_t tclass=dir
Expand Down
18 changes: 16 additions & 2 deletions xml/tuning_kexec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@
</sect1>
<sect1 xml:id="cha-tuning-kexec-internals">
<title>&kexec; internals</title>

<remark> ssarkar 07-25-2023:
We can reinforce the existing content with material from https://wiki.archlinux.org/title/kexec,
especially from the systemd-boot and troubleshooting sections. Perhaps it is better to take it up
when writing smart docs on these topics.
</remark>
<para>
The most important component of &kexec; is the
<filename>/sbin/kexec</filename> command. You can load a kernel with &kexec;
Expand Down Expand Up @@ -188,6 +192,14 @@
/proc/cmdline) more_options"</replaceable>.
</para>

<para>
For example, to load the <filename>/boot/vmlinuz-5.14.21-150500.53-default</filename> kernel image
with the command line of the currently running production kernel and the
<filename>/boot/initrd</filename> file, run the following command:
</para>
<screen>&prompt.root; kexec -l /boot/vmlinuz-5.14.21-150500.53-default \
--append="$(cat /proc/cmdline)" --initrd=/boot/initrd</screen>

<para>
You can always unload the previously loaded kernel. To unload a kernel that
was loaded with the <option>-l</option> option, use the
Expand Down Expand Up @@ -299,9 +311,11 @@ MaxHigh: 45824 </screen>
<para>
The maximum number of LUN kernel paths that you expect to ever create
on the computer. Exclude multipath devices from this number, as these
are ignored.
are ignored. To get the <emphasis>current</emphasis> number of LUNs available on your
system, run the following command:
</para>
</formalpara>
<screen>&prompt.user; cat /proc/scsi/scsi | grep Lun | wc -l</screen>
</listitem>
</itemizedlist>
</step>
Expand Down

0 comments on commit 4636531

Please sign in to comment.