Merge pull request #16148 from womfoo/openldap

openldap: add -h urlList in service so LDAP TLS could be enabled

Changed files
+9 -2
nixos
modules
services
databases
+9 -2
nixos/modules/services/databases/openldap.nix
···
description = "Group account under which slapd runs.";
};
dataDir = mkOption {
type = types.string;
default = "/var/db/openldap";
···
type = types.lines;
default = "";
description = "
-
sldapd.conf configuration
";
example = literalExample ''
'''
···
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 -f ${configFile}";
};
users.extraUsers.openldap =
···
description = "Group account under which slapd runs.";
};
+
urlList = mkOption {
+
type = types.listOf types.string;
+
default = [ "ldap:///" ];
+
description = "URL list slapd should listen on.";
+
example = [ "ldaps:///" ];
+
};
+
dataDir = mkOption {
type = types.string;
default = "/var/db/openldap";
···
type = types.lines;
default = "";
description = "
+
slapd.conf configuration
";
example = literalExample ''
'''
···
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}\" -f ${configFile}";
};
users.extraUsers.openldap =