movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

openldap: change runtime directory

Browse source 
Use `openldap` for consistency between `/var/lib` and `/run`.
This commit is contained in:
Kai Wohlfahrt 2022-06-05 20:18:21 +01:00 • committed by Jörg Thalheim
parent 334d622ec7
commit 60d1c1d9ad
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -319,7 +319,7 @@ in {
# outside the main process: # outside the main process:
# Got notification message from PID 6378, but reception only permitted for main PID 6377 # Got notification message from PID 6378, but reception only permitted for main PID 6377
NotifyAccess = "all"; NotifyAccess = "all";
RuntimeDirectory = "slapd"; # TODO: openldap, for consistency RuntimeDirectory = "openldap";
StateDirectory = ["openldap"] StateDirectory = ["openldap"]
++ (map ({olcDbDirectory, ... }: removePrefix "/var/lib/" olcDbDirectory) (attrValues dbSettings)); ++ (map ({olcDbDirectory, ... }: removePrefix "/var/lib/" olcDbDirectory) (attrValues dbSettings));
StateDirectoryMode = "700"; StateDirectoryMode = "700";

2
pkgs/development/libraries/openldap/default.nix
View file

@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
"ac_cv_func_memcmp_working=yes" "ac_cv_func_memcmp_working=yes"
] ++ lib.optional stdenv.isFreeBSD "--with-pic"; ] ++ lib.optional stdenv.isFreeBSD "--with-pic";
NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/slapd/ldapi\"" ]; NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ];
makeFlags= [ makeFlags= [
"CC=${stdenv.cc.targetPrefix}cc" "CC=${stdenv.cc.targetPrefix}cc"