From 159aaba73883c732c0980e4e36b4564be58c300f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Thu, 26 Apr 2012 15:40:27 +0300
Subject: [PATCH] Added support for setting overlay module options for
 ldap::database.

---
 ldap/manifests/init.pp                 |  9 +++++++--
 ldap/templates/slapd-database.conf.erb | 10 ++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index 79492c2..b2e415f 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -546,11 +546,16 @@ class ldap::server {
 #       Password for uid=replicator,cn=config,${name} user on master.
 #       Only needed for slave databases.
 #
+#   $moduleoptions:
+#       Options for overlay modules.
+#
 # === Sample usage
 #
-# ldap::server::database { "dc=example,dc=com": }
+# ldap::server::database { "dc=example,dc=com":
+#     moduleoptions => [ "smbkrb5pwd-enable=samba", ]
+# }
 #
-define ldap::server::database($aclsource = "", $master = "", $syncpw = "") {
+define ldap::server::database($aclsource = "", $master = "", $syncpw = "", moduleoptions = []) {
 
     include ldap::server
 
diff --git a/ldap/templates/slapd-database.conf.erb b/ldap/templates/slapd-database.conf.erb
index ebc524b..b5b2bb7 100644
--- a/ldap/templates/slapd-database.conf.erb
+++ b/ldap/templates/slapd-database.conf.erb
@@ -8,6 +8,16 @@ suffix				"<%= name %>"
 checkpoint			1024 15
 rootdn				"cn=manager,<%= name %>"
 
+<% if has_variable?("ldap_server_modules") -%>
+<%   ldap_server_modules.each do |name| -%>
+overlay				<%= name %>
+<%   end -%>
+<% end -%>
+
+<% moduleoptions.each do |name| -%>
+<%= name.split("=")[0] %> <%= name.split("=")[1] %>
+<% end -%>
+
 overlay				ppolicy
 ppolicy_default			cn=pwdPolicy,cn=config,<%= name %>
 ppolicy_hash_cleartext