On 07/01/2016 11:55 AM, Michal Židek wrote:
Hi!
This patch adds man page for config file merging.
Michal
I had extra newline in the previous patch. Fixed
in the attached patch.
Michal
>From 98d38c25bfff26330ba1ab01b0199abf2a224a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzi...@redhat.com>
Date: Fri, 1 Jul 2016 11:23:20 +0200
Subject: [PATCH] MAN: Config file merging
Related to:
https://fedorahosted.org/sssd/ticket/2247
Explain config file merging in sssd.conf
man page.
---
src/man/sssd.conf.5.xml | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index d5442d0..1c9d966 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -55,6 +55,44 @@
</para>
</refsect1>
+ <refsect1 id='config-merging'>
+ <title>MERGING WITH CONFIGURATION FILE SNIPETS</title>
+
+ <para>
+ Since SSSD version 1.14 it is possible to merge
+ <filename>sssd.conf</filename> file with configuration
+ file snippets from include directory
+ <filename>conf.d</filename>. This feature is available
+ if SSSD was compiled with libini version 1.3.0 or later.
+ </para>
+
+ <para>
+ Any file placed in the <filename>conf.d</filename>
+ that ends with suffix <quote><filename>.conf</filename></quote>
+ and does not begin with a dot (<quote>.</quote>) will
+ be merged with <filename>sssd.conf</filename>.
+ </para>
+
+ <para>
+ The configuration snippets from <filename>conf.d</filename>
+ have higher priority than <filename>sssd.conf</filename>
+ and override <filename>sssd.conf</filename> when
+ conflicts occur. If several snippet files
+ are present in <filename>conf.d</filename>, then they are
+ merged in alphabetical order (based on locale).
+ Files merged later have higher priority. Numerical
+ prefixes (<filename>01_snippet.conf</filename>,
+ <filename>02_snippet.conf</filename> etc.) can help
+ visualize the priority (higher number means higher
+ priority).
+ </para>
+
+ <para>
+ The snippet files have the same file ownership and file
+ permissions requirements as <filename>sssd.conf</filename>.
+ </para>
+ </refsect1>
+
<refsect1 id='general-options'>
<title>GENERAL OPTIONS</title>
<para>
--
2.5.0
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
