nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-20 03:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

openldap: run in foreground

Browse Source 
Now that we use notify daemon type, this works safely and simplifies
configuration.
This commit is contained in:
Kai Wohlfahrt 2022-06-04 20:17:11 +01:00 committed by Jörg Thalheim
parent d72f89a8fc
commit 38ead944ce
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/databases/openldap.nix
View File

@ -169,8 +169,7 @@ in {
default = null;
description = ''
Use this config directory instead of generating one from the
<literal>settings</literal> option. Overrides all NixOS settings. If
you use this option,ensure `olcPidFile` is set to `/run/slapd/slapd.conf`.
<literal>settings</literal> option. Overrides all NixOS settings.
'';
example = "/var/db/slapd.d";
};
@ -216,7 +215,6 @@ in {
attrs = {
objectClass = "olcGlobal";
cn = "config";
olcPidFile = "/run/slapd/slapd.pid";
};
children."cn=schema".attrs = {
cn = "schema";
@ -265,7 +263,7 @@ in {
'';
serviceConfig = {
ExecStart = lib.escapeShellArgs ([
"${openldap}/libexec/slapd" "-u" cfg.user "-g" cfg.group "-F" configDir
"${openldap}/libexec/slapd" "-d" "0" "-u" cfg.user "-g" cfg.group "-F" configDir
"-h" (lib.concatStringsSep " " cfg.urlList)
]);
Type = "notify";
@ -273,7 +271,6 @@ in {
# outside the main process:
# Got notification message from PID 6378, but reception only permitted for main PID 6377
NotifyAccess = "all";
PIDFile = cfg.settings.attrs.olcPidFile;
};
};