On Wed, Apr 18, 2012 at 02:08:44PM +0200, Jan Zelený wrote:
> > On Wed, Apr 18, 2012 at 01:45:09PM +0200, Jan Zelený wrote:
> > > > [PATCH 1/2] MAN: timeout can be specified for services, too
> > > > The manual page claimed the option only worked for domains
> > >
> > > Nack, please replace the "backend" word, it is a bit confusing since it
> > > is related to generic service, not only backend.
> >
> > Oops, I only replaced the first occurence of backend. Thanks, new
> > patches are attached.
>
> Ack
> <nitpick>there is a double space in the text, please remove before
> pushing</nitpick>
>
> >
> > > > [PATCH 2/2] MAN: document the hostid and autofs providers
> > > > They were left out
> > >
> > > Ack
>
> Ack
>
> Thanks
> Jan
The XSL template squashes multiple spaces, but yeah, the code should
look nice.
>From a5f9bf06a3af17c36e502e6915609ae4f2705a84 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhro...@redhat.com>
Date: Mon, 16 Apr 2012 10:04:35 +0200
Subject: [PATCH 1/2] MAN: timeout can be specified for services, too
---
src/man/sssd.conf.5.xml | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index
63e396a545f04b28b1bfb0ccc69b454aa83686e9..429b1ad035dabc001dcaeacceb31bba414887ada
100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -254,6 +254,19 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term>timeout (integer)</term>
+ <listitem>
+ <para>
+ Timeout in seconds between heartbeats for this
+ service. This is used to ensure that the process
+ is alive and capable of answering requests.
+ </para>
+ <para>
+ Default: 10
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>reconnection_retries (integer)</term>
<listitem>
<para>
@@ -721,20 +734,6 @@
</varlistentry>
<varlistentry>
- <term>timeout (integer)</term>
- <listitem>
- <para>
- Timeout in seconds between heartbeats for this
domain.
- This is used to ensure that the backend process is
- alive and capable of answering requests.
- </para>
- <para>
- Default: 10
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>enumerate (bool)</term>
<listitem>
<para>
--
1.7.7.6
>From d2b717a79071563e5517a80a110df556efdabd86 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhro...@redhat.com>
Date: Mon, 16 Apr 2012 10:56:55 +0200
Subject: [PATCH 2/2] MAN: document the hostid and autofs providers
---
src/man/sssd.conf.5.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index
429b1ad035dabc001dcaeacceb31bba414887ada..629d3d1b9c2aa32dcc6eee03b0700671434c970b
100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -1068,6 +1068,66 @@
</listitem>
</varlistentry>
+ <varlistentry condition="with_autofs">
+ <term>autofs_provider (string)</term>
+ <listitem>
+ <para>
+ <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"; href="include/experimental.xml" />
+ </para>
+ <para>
+ The autofs provider used for the domain.
+ Supported autofs providers are:
+ </para>
+ <para>
+ <quote>ldap</quote> to load maps stored in LDAP.
See
+ <citerefentry>
+ <refentrytitle>sssd-ldap</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry> for more information on
configuring LDAP.
+ </para>
+ <para>
+ <quote>ipa</quote> to load maps stored in an IPA
+ server. See
+ <citerefentry>
+ <refentrytitle>sssd-ipa</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry> for more information on
configuring IPA.
+ </para>
+ <para>
+ <quote>none</quote> disables autofs explicitly.
+ </para>
+ <para>
+ Default: The value of <quote>id_provider</quote>
is used if it
+ is set.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>hostid_provider (string)</term>
+ <listitem>
+ <para>
+ The provider used for retreiving host identity
information.
+ Supported hostid providers are:
+ </para>
+ <para>
+ <quote>ipa</quote> to load host identity stored in
an IPA
+ server. See
+ <citerefentry>
+ <refentrytitle>sssd-ipa</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry> for more information on
configuring IPA.
+ </para>
+ <para>
+ <quote>none</quote> disables hostid explicitly.
+ </para>
+ <para>
+ Default: The value of <quote>id_provider</quote>
is used if it
+ is set.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term>lookup_family_order (string)</term>
<listitem>
--
1.7.7.6
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/sssd-devel
