mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity

nixos/openldap: Add release-notes for OLC config

Browse source
This commit is contained in:
Kai Wohlfahrt 2020-09-13 22:42:54 +01:00
parent adda7e62d0
commit 5fafbee87a
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2103.xml
View file

@ -185,6 +185,14 @@
which is the new stable release. OpenAFS 1.6 was removed. which is the new stable release. OpenAFS 1.6 was removed.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>openldap</literal> module now has support for OLC-style
configuration, users of the <literal>configDir</literal> option may wish
to migrate. If you continue to use <literal>configDir</literal>, ensure that
<literal>olcPidFile</literal> is set to <literal>/run/slapd/slapd.pid</literal>.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

8
nixos/modules/services/databases/openldap.nix
View file

@ -421,13 +421,7 @@ in {
let oldValue = (getAttr old cfg); let oldValue = (getAttr old cfg);
in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue
)} )}
'') deprecations)) ++ (optional (cfg.configDir != null && (versionOlder config.system.stateVersion "20.09")) '' '') deprecations));
The attribute `services.openldap.settings` now exists, and may be more
useful than `services.openldap.configDir`. If you continue to use
`configDir`, ensure that `olcPidFile` is set to "/run/slapd/slapd.pid".
Set `system.stateVersion` to "20.09" or greater to silence this message.
'');
assertions = [{ assertions = [{
assertion = !(cfg.rootpwFile != null && cfg.rootpw != null); assertion = !(cfg.rootpwFile != null && cfg.rootpw != null);