|
 |
6b8fee |
From fee9bde11b42ab39af6397a0c0ce4775443b28ea Mon Sep 17 00:00:00 2001
|
|
|
6b8fee |
From: Stef Walter <stefw@redhat.com>
|
|
|
6b8fee |
Date: Mon, 6 Feb 2017 12:25:52 +0100
|
|
|
6b8fee |
Subject: [PATCH] doc: Add short arguments like -U arguments to realm manual
|
|
|
6b8fee |
page
|
|
|
6b8fee |
|
|
|
6b8fee |
And clean up the documentation for the various arguments.
|
|
|
6b8fee |
---
|
|
|
6b8fee |
doc/manual/realm.xml | 70 +++++++++++++++++++++++---------------------
|
|
|
6b8fee |
1 file changed, 37 insertions(+), 33 deletions(-)
|
|
|
6b8fee |
|
|
|
6b8fee |
diff --git a/doc/manual/realm.xml b/doc/manual/realm.xml
|
|
|
6b8fee |
index 6724d80..9d9136a 100644
|
|
|
6b8fee |
--- a/doc/manual/realm.xml
|
|
|
6b8fee |
+++ b/doc/manual/realm.xml
|
|
|
6b8fee |
@@ -60,7 +60,7 @@
|
|
|
6b8fee |
|
|
|
6b8fee |
<variablelist>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--install=/path</option></term>
|
|
|
6b8fee |
+ <term><option>-i</option>, <option>--install=/path</option></term>
|
|
|
6b8fee |
<listitem><para>Run in install mode. This makes realmd
|
|
|
6b8fee |
chroot into the specified directory and place files in
|
|
|
6b8fee |
appropriate locations for use during an installer. No
|
|
|
6b8fee |
@@ -73,7 +73,7 @@
|
|
|
6b8fee |
for input.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--verbose, -v</option></term>
|
|
|
6b8fee |
+ <term><option>-v</option>, <option>--verbose</option></term>
|
|
|
6b8fee |
<listitem><para>Display verbose diagnostics while doing
|
|
|
6b8fee |
running commands.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
@@ -105,7 +105,7 @@ $ realm discover domain.example.com
|
|
|
6b8fee |
|
|
|
6b8fee |
<variablelist>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--all</option></term>
|
|
|
6b8fee |
+ <term><option>-a</option>, <option>--all</option></term>
|
|
|
6b8fee |
<listitem><para>Show all discovered realms (in various
|
|
|
6b8fee |
configurations).</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
@@ -116,6 +116,10 @@ $ realm discover domain.example.com
|
|
|
6b8fee |
<replaceable>sssd</replaceable> or
|
|
|
6b8fee |
<replaceable>winbind</replaceable>.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
+ <varlistentry>
|
|
|
6b8fee |
+ <term><option>-n</option>, <option>--name</option></term>
|
|
|
6b8fee |
+ <listitem><para>Only show the names of the discovered realms.</para></listitem>
|
|
|
6b8fee |
+ </varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
<term><option>--server-software=xxx</option></term>
|
|
|
6b8fee |
<listitem><para>Only discover realms which run the
|
|
|
6b8fee |
@@ -187,10 +191,13 @@ $ realm join --user=admin --computer-ou=OU=Special domain.example.com
|
|
|
6b8fee |
in the domain already.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--user=xxx</option></term>
|
|
|
6b8fee |
- <listitem><para>The user name to be used to authenticate
|
|
|
6b8fee |
- with when joining the machine to the realm. You will
|
|
|
6b8fee |
- be prompted for a password.</para></listitem>
|
|
|
6b8fee |
+ <term><option>--client-software=xxx</option></term>
|
|
|
6b8fee |
+ <listitem><para>Only join realms for which we can
|
|
|
6b8fee |
+ use the given client software. Possible values include
|
|
|
6b8fee |
+ <replaceable>sssd</replaceable> or
|
|
|
6b8fee |
+ <replaceable>winbind</replaceable>. Not all values are
|
|
|
6b8fee |
+ supported for all realms. By default the client software
|
|
|
6b8fee |
+ is automatically selected.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
<term><option>--computer-ou=OU=xxx</option></term>
|
|
|
6b8fee |
@@ -201,6 +208,14 @@ $ realm join --user=admin --computer-ou=OU=Special domain.example.com
|
|
|
6b8fee |
DSE portion of distinguished name. This is an Active
|
|
|
6b8fee |
Directory specific option.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
+ <varlistentry>
|
|
|
6b8fee |
+ <term><option>--membership-software=xxx</option></term>
|
|
|
6b8fee |
+ <listitem><para>The software to use when joining to the
|
|
|
6b8fee |
+ realm. Possible values include <replaceable>samba</replaceable> or
|
|
|
6b8fee |
+ <replaceable>adcli</replaceable>. Not all values are
|
|
|
6b8fee |
+ supported for all realms. By default the membership software
|
|
|
6b8fee |
+ is automatically selected.</para></listitem>
|
|
|
6b8fee |
+ </varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
<term><option>--no-password</option></term>
|
|
|
6b8fee |
<listitem><para>Perform the join automatically without
|
|
|
6b8fee |
@@ -213,13 +228,16 @@ $ realm join --user=admin --computer-ou=OU=Special domain.example.com
|
|
|
6b8fee |
all types of realms.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--client-software=xxx</option></term>
|
|
|
6b8fee |
- <listitem><para>Only join realms for which we can
|
|
|
6b8fee |
- use the given client software. Possible values include
|
|
|
6b8fee |
- <replaceable>sssd</replaceable> or
|
|
|
6b8fee |
- <replaceable>winbind</replaceable>. Not all values are
|
|
|
6b8fee |
- supported for all realms. By default the client software
|
|
|
6b8fee |
- is automatically selected.</para></listitem>
|
|
|
6b8fee |
+ <term><option>--os-name=xxx</option></term>
|
|
|
6b8fee |
+ <listitem><para>The name of the operation system of the
|
|
|
6b8fee |
+ client. When joining an AD domain the value is store in
|
|
|
6b8fee |
+ the matching AD attribute.</para></listitem>
|
|
|
6b8fee |
+ </varlistentry>
|
|
|
6b8fee |
+ <varlistentry>
|
|
|
6b8fee |
+ <term><option>--os-version=xxx</option></term>
|
|
|
6b8fee |
+ <listitem><para>The version of the operation system of the
|
|
|
6b8fee |
+ client. When joining an AD domain the value is store in
|
|
|
6b8fee |
+ the matching AD attribute.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
<term><option>--server-software=xxx</option></term>
|
|
|
6b8fee |
@@ -229,12 +247,10 @@ $ realm join --user=admin --computer-ou=OU=Special domain.example.com
|
|
|
6b8fee |
<replaceable>ipa</replaceable>.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--membership-software=xxx</option></term>
|
|
|
6b8fee |
- <listitem><para>The software to use when joining to the
|
|
|
6b8fee |
- realm. Possible values include <replaceable>samba</replaceable> or
|
|
|
6b8fee |
- <replaceable>adcli</replaceable>. Not all values are
|
|
|
6b8fee |
- supported for all realms. By default the membership software
|
|
|
6b8fee |
- is automatically selected.</para></listitem>
|
|
|
6b8fee |
+ <term><option>-U</option>, <option>--user=xxx</option></term>
|
|
|
6b8fee |
+ <listitem><para>The user name to be used to authenticate
|
|
|
6b8fee |
+ with when joining the machine to the realm. You will
|
|
|
6b8fee |
+ be prompted for a password.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
<term><option>--user-principal=<parameter>host/name@REALM</parameter></option></term>
|
|
|
6b8fee |
@@ -243,18 +259,6 @@ $ realm join --user=admin --computer-ou=OU=Special domain.example.com
|
|
|
6b8fee |
the value for this option, then a principal will be set
|
|
|
6b8fee |
in the form of <literal>host/shortname@REALM</literal></para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
- <varlistentry>
|
|
|
6b8fee |
- <term><option>--os-name=xxx</option></term>
|
|
|
6b8fee |
- <listitem><para>The name of the operation system of the
|
|
|
6b8fee |
- client. When joining an AD domain the value is store in
|
|
|
6b8fee |
- the matching AD attribute.</para></listitem>
|
|
|
6b8fee |
- </varlistentry>
|
|
|
6b8fee |
- <varlistentry>
|
|
|
6b8fee |
- <term><option>--os-version=xxx</option></term>
|
|
|
6b8fee |
- <listitem><para>The version of the operation system of the
|
|
|
6b8fee |
- client. When joining an AD domain the value is store in
|
|
|
6b8fee |
- the matching AD attribute.</para></listitem>
|
|
|
6b8fee |
- </varlistentry>
|
|
|
6b8fee |
</variablelist>
|
|
|
6b8fee |
|
|
|
6b8fee |
</refsect1>
|
|
|
6b8fee |
@@ -300,7 +304,7 @@ $ realm leave domain.example.com
|
|
|
6b8fee |
for a pasword.</para></listitem>
|
|
|
6b8fee |
</varlistentry>
|
|
|
6b8fee |
<varlistentry>
|
|
|
6b8fee |
- <term><option>--user</option></term>
|
|
|
6b8fee |
+ <term><option>-U</option>, <option>--user</option></term>
|
|
|
6b8fee |
<listitem><para>The user name to be used to authenticate
|
|
|
6b8fee |
with when leaving the realm. You will be prompted for a
|
|
|
6b8fee |
password. Implies <option>--remove</option>.</para></listitem>
|
|
|
6b8fee |
--
|
|
|
6b8fee |
2.21.0
|
|
|
6b8fee |
|