From 5fafbee87a3ecce798df55bbaaabcead43fc17b6 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 13 Sep 2020 22:42:54 +0100
Subject: [PATCH] nixos/openldap: Add release-notes for OLC config

---
 nixos/doc/manual/release-notes/rl-2103.xml    | 8 ++++++++
 nixos/modules/services/databases/openldap.nix | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 10d5cda77464..845aa8415040 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -185,6 +185,14 @@
      which is the new stable release.  OpenAFS 1.6 was removed.
     </para>
    </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>
  </section>
 
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index cb51a3cc575c..f9355201602c 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -421,13 +421,7 @@ in {
           let oldValue = (getAttr old cfg);
           in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue
         )}
-    '') deprecations)) ++ (optional (cfg.configDir != null && (versionOlder config.system.stateVersion "20.09")) ''
-      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.
-    '');
+    '') deprecations));
 
     assertions = [{
       assertion = !(cfg.rootpwFile != null && cfg.rootpw != null);