From 1e3f622dbd8999e37876783f8afa0746b2ddd987 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 23 Oct 2016 11:55:23 +0000 Subject: [PATCH] openldap: set configDir as null fixes an error #19794 with this new option f3404b7 when using plain configuration files --- 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 875ed0f39db8..54556597b74e 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -55,7 +55,7 @@ in configDir = mkOption { type = types.path; - default = ""; + default = null; description = "Use this optional config directory instead of using slapd.conf"; example = "/var/db/slapd.d"; }; @@ -103,7 +103,7 @@ in mkdir -p ${cfg.dataDir} chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} ''; - serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == "" then "-f "+configFile else "-F "+cfg.configDir}"; + serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}"; }; users.extraUsers.openldap =