From 057cb570beb9226b610dffa00cffd98b007a0686 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Sun, 16 Aug 2020 20:17:06 +0100
Subject: [PATCH] nixos/openldap: Add delcarativeConfig by suffix

Adding by index could be an issue if the user wanted the data to be
added to a DB other than the first.
---
 nixos/modules/services/databases/openldap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index afe24597e03f..d03c8cd7cfd3 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -474,14 +474,14 @@ in {
             ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true
           '' else ''
             rm -Rf '${configDir}'/*
-            ${openldap}/bin/slapadd -F ${configDir} -n0 -l ${settingsFile}
+            ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile}
           ''
         )}
         chown -R "${cfg.user}:${cfg.group}" '${configDir}'
 
         ${optionalString (cfg.declarativeContents != null) ''
           rm -Rf '${lib.head dataDirs}'/*
-          ${openldap}/bin/slapadd -F ${configDir} -n1 -l ${dataFile}
+          ${openldap}/bin/slapadd -F ${configDir} -b${cfg.suffix} -l ${dataFile}
           chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs}
         ''}