Merge pull request #16148 from womfoo/openldap

openldap: add -h urlList in service so LDAP TLS could be enabled
This commit is contained in:
Joachim Fasting 2016-06-16 16:37:55 +02:00 committed by GitHub
commit c7ca9faa51

View File

@ -40,6 +40,13 @@ in
description = "Group account under which slapd runs."; 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 { dataDir = mkOption {
type = types.string; type = types.string;
default = "/var/db/openldap"; default = "/var/db/openldap";
@ -50,7 +57,7 @@ in
type = types.lines; type = types.lines;
default = ""; default = "";
description = " description = "
sldapd.conf configuration slapd.conf configuration
"; ";
example = literalExample '' example = literalExample ''
''' '''
@ -89,7 +96,7 @@ in
mkdir -p ${cfg.dataDir} mkdir -p ${cfg.dataDir}
chown -R ${cfg.user}:${cfg.group} ${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}"; serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" -f ${configFile}";
}; };
users.extraUsers.openldap = users.extraUsers.openldap =