On 07/01/2016 10:34 PM, Dan Lavu wrote:
I couldn't apply your patch to my repo, so I just modified the text in
your patch. I have a question though, will this be the new default
behavior for sssd 1.4.x onwards in Fedora and RHEL? Also I think the
feature, being called "merging" is not very accurate, I think it should
be 'include additional configuration files' or 'read additional
configuration files', merging suggests that it will merge the
configuration files into one file... thanks to Git. ;)
Dan
Hi Dan,
thank you for the new wording.
I agree that calling the feature config file
merging could be confusing, so I used the verb
"include" instead of "merge" and changed the section
name.
I also removed the SSSD version reference as Lukas
suggested.
Otherwise the wording should be the same as you
proposed.
To your question. Yes, this is going to be default
behavior with all new SSSD versions compiled with
new libini.
See the attached patch.
Michal
>From 2b3fa8d8723d78b1da72b956cad3e980f8463ea0 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 configuration merging in sssd.conf
man page.
---
src/man/sssd.conf.5.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index d5442d0..924dead 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -55,6 +55,45 @@
</para>
</refsect1>
+ <refsect1 id='config-snippets'>
+ <title>CONFIGURATION SNIPPETS FROM INCLUDE DIRECTORY</title>
+
+ <para>
+ The configuration file <filename>sssd.conf</filename> will
+ include configuration snippets using the 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 <filename>conf.d</filename>
+ that ends in <quote><filename>.conf</filename></quote>
+ and does not begin with a dot (<quote>.</quote>) will
+ be used together with <filename>sssd.conf</filename>
+ to configure SSSD.
+ </para>
+
+ <para>
+ The configuration snippets from <filename>conf.d</filename>
+ have higher priority than <filename>sssd.conf</filename>
+ and will override <filename>sssd.conf</filename> when
+ conflicts occur. If several snippets are present in
+ <filename>conf.d</filename>, then they are included in
+ alphabetical order (based on locale).
+ Files included 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 require the same owner and permissions
+ as <filename>sssd.conf</filename>. Which are by default
+ root:root and 0600.
+ </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
