From 430e1c2b57f7d46582caf524c04247fb1f24eee4 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 17 Jul 2012 16:43:52 +0300
Subject: [PATCH] Fixed slapd.conf modulepath

---
 ldap/manifests/init.pp        | 14 ++++++++++++--
 ldap/templates/slapd.conf.erb |  8 +++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index b9eda70..2202dad 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -353,6 +353,7 @@ class ldap::server {
             $package_name = "slapd"
             $service_name = "slapd"
             $config = "/etc/ldap"
+            $modulepath = "/usr/lib/openldap"
         }
         "fedora": {
             $user = "ldap"
@@ -360,6 +361,10 @@ class ldap::server {
             $package_name = "openldap-servers"
             $service_name = "slapd"
             $config = "/etc/openldap"
+            $modulepath = $architecture ? {
+                "x86_64" => "/usr/lib64/openldap",
+                default  => "/usr/lib/openldap",
+            }
         }
         "centos": {
             $user = "ldap"
@@ -373,6 +378,10 @@ class ldap::server {
                 /^6/ => "slapd",
             }
             $config = "/etc/openldap"
+            $modulepath = $architecture ? {
+                "x86_64" => "/usr/lib64/openldap",
+                default  => "/usr/lib/openldap",
+            }
         }
         "openbsd": {
             $user = "_openldap"
@@ -380,6 +389,7 @@ class ldap::server {
             $package_name = "openldap-server"
             $service_name = "slapd"
             $config = "/etc/openldap"
+            $modulepath = ""
         }
     }
 
@@ -423,7 +433,7 @@ class ldap::server {
     file { "${config}/slapd.conf.d":
         ensure  => directory,
         source  => "puppet:///modules/custom/empty",
-        mode    => "0750",
+        mode    => "0640",
         owner   => "root",
         group   => $group,
         purge   => true,
@@ -498,7 +508,7 @@ class ldap::server {
     file { "${config}/schema":
         ensure  => directory,
         source  => "puppet:///modules/custom/empty",
-        mode    => "0755",
+        mode    => "0644",
         owner   => "root",
         group   => $operatingsystem ? {
             "openbsd" => "wheel",
diff --git a/ldap/templates/slapd.conf.erb b/ldap/templates/slapd.conf.erb
index 75aadc5..6f47f8e 100644
--- a/ldap/templates/slapd.conf.erb
+++ b/ldap/templates/slapd.conf.erb
@@ -23,12 +23,14 @@ pidfile		/var/run/openldap/slapd.pid
 argsfile	/var/run/openldap/slapd.args
 
 # overlay modules to load
-modulepath /usr/lib/openldap
+<% if scope.lookupvar('ldap::server::modulepath') != '' -%>
+modulepath <%= modulepath %>
 moduleload ppolicy.la
 moduleload syncprov.la
-<% if has_variable?('ldap_server_modules') -%>
-<%   ldap_server_modules.each do |name| -%>
+<%   if has_variable?('ldap_server_modules') -%>
+<%     ldap_server_modules.each do |name| -%>
 moduleload <%= name %>.la
+<%     end -%>
 <%   end -%>
 <% end -%>