summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-06-16 16:37:55 +0200
committerGitHub <noreply@github.com>2016-06-16 16:37:55 +0200
commitc7ca9faa51241a1d99720293f99686d6987c7e56 (patch)
tree626d16fd0870ce4f513be40a25276253b564ee23 /nixos/modules/services
parentecd3617d7a955c9cfcfc68a8dd8c1c1138153151 (diff)
parentf79930849a2cfda9af2a1b949544e3ebb19b48e4 (diff)
downloadnixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.tar
nixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.tar.gz
nixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.tar.bz2
nixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.tar.lz
nixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.tar.xz
nixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.tar.zst
nixlib-c7ca9faa51241a1d99720293f99686d6987c7e56.zip
Merge pull request #16148 from womfoo/openldap
openldap: add -h urlList in service so LDAP TLS could be enabled
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/databases/openldap.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index cbdc676d47bd..9f22aa7c92b2 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -40,6 +40,13 @@ in
         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";
@@ -50,7 +57,7 @@ in
         type = types.lines;
         default = "";
         description = "
-          sldapd.conf configuration
+          slapd.conf configuration
         ";
         example = literalExample ''
             '''
@@ -89,7 +96,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 -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 =