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 On Fri, Jul 1, 2016 at 11:41 AM, Michal Židek <mzi...@redhat.com> wrote: > On 07/01/2016 03:58 PM, Lukas Slebodnik wrote: > >> On (01/07/16 12:14), Michal Židek wrote: >> >>> 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 >>> >>> There is separate tcket for this >> https://fedorahosted.org/sssd/ticket/3062 >> Please assing it to yourself and mark that patch hs beedn submitted. >> >> >> 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 >>> >> ^^^^ >> SSSD version is not important >> But I let review for native speaker. >> >> LS >> > > I removed the SSSD version note. Other than that, the patch is > the same. > > Michal > > > _______________________________________________ > sssd-devel mailing list > sssd-devel@lists.fedorahosted.org > > https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org > >
From bd0abfe96273c6ef8679ec1098e9a572acc77914 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 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml index d5442d0..3d0ecc1 100644 --- a/src/man/sssd.conf.5.xml +++ b/src/man/sssd.conf.5.xml @@ -55,6 +55,45 @@ </para> </refsect1> + <refsect1 id='config-merging'> + <title>MERGING CONFIGURATION FILE SNIPPETS</title> + + <para> + In SSSD version 1.14 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 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 will override <filename>sssd.conf</filename> when + conflicts occur. If several snippets 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 requires 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
