about summary refs log tree commit diff
path: root/nixos/modules/services/databases
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@higgsboson.tk>2016-10-22 09:33:15 +0200
committerGitHub <noreply@github.com>2016-10-22 09:33:15 +0200
commit6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459 (patch)
tree0cceb00a6b49ae55a3e56110e633d23c3ee3e8b1 /nixos/modules/services/databases
parentf2872c5d1d12eea20857620a825db4491edbcf59 (diff)
parentf3404b71a7a7a1eac1545fa4c577b3b3e175a681 (diff)
downloadnixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.tar
nixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.tar.gz
nixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.tar.bz2
nixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.tar.lz
nixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.tar.xz
nixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.tar.zst
nixlib-6f99aa9a7e5bdb8466afcc9d70299aaf90b2d459.zip
Merge pull request #19289 from DerTim1/openldap-add-configDir-option
openldap: add configDir option
Diffstat (limited to 'nixos/modules/services/databases')
-rw-r--r--nixos/modules/services/databases/openldap.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9f22aa7c92b2..875ed0f39db8 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -53,6 +53,13 @@ in
         description = "The database directory.";
       };
 
+      configDir = mkOption {
+        type = types.path;
+        default = "";
+        description = "Use this optional config directory instead of using slapd.conf";
+        example = "/var/db/slapd.d";
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -96,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}\" -f ${configFile}";
+      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}";
     };
 
     users.extraUsers.openldap =