tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed slapd.conf modulepath

Browse source
This commit is contained in:
Ossi Salmi 2012-07-17 16:43:52 +03:00
parent 7752295779
commit 430e1c2b57
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ldap/manifests/init.pp
View file

@ -353,6 +353,7 @@ class ldap::server {
$package_name = "slapd" $package_name = "slapd"
$service_name = "slapd" $service_name = "slapd"
$config = "/etc/ldap" $config = "/etc/ldap"
$modulepath = "/usr/lib/openldap"
} }
"fedora": { "fedora": {
$user = "ldap" $user = "ldap"
@ -360,6 +361,10 @@ class ldap::server {
$package_name = "openldap-servers" $package_name = "openldap-servers"
$service_name = "slapd" $service_name = "slapd"
$config = "/etc/openldap" $config = "/etc/openldap"
$modulepath = $architecture ? {
"x86_64" => "/usr/lib64/openldap",
default => "/usr/lib/openldap",
}
} }
"centos": { "centos": {
$user = "ldap" $user = "ldap"
@ -373,6 +378,10 @@ class ldap::server {
/^6/ => "slapd", /^6/ => "slapd",
} }
$config = "/etc/openldap" $config = "/etc/openldap"
$modulepath = $architecture ? {
"x86_64" => "/usr/lib64/openldap",
default => "/usr/lib/openldap",
}
} }
"openbsd": { "openbsd": {
$user = "_openldap" $user = "_openldap"
@ -380,6 +389,7 @@ class ldap::server {
$package_name = "openldap-server" $package_name = "openldap-server"
$service_name = "slapd" $service_name = "slapd"
$config = "/etc/openldap" $config = "/etc/openldap"
$modulepath = ""
} }
} }
@ -423,7 +433,7 @@ class ldap::server {
file { "${config}/slapd.conf.d": file { "${config}/slapd.conf.d":
ensure => directory, ensure => directory,
source => "puppet:///modules/custom/empty", source => "puppet:///modules/custom/empty",
mode => "0750", mode => "0640",
owner => "root", owner => "root",
group => $group, group => $group,
purge => true, purge => true,
@ -498,7 +508,7 @@ class ldap::server {
file { "${config}/schema": file { "${config}/schema":
ensure => directory, ensure => directory,
source => "puppet:///modules/custom/empty", source => "puppet:///modules/custom/empty",
mode => "0755", mode => "0644",
owner => "root", owner => "root",
group => $operatingsystem ? { group => $operatingsystem ? {
"openbsd" => "wheel", "openbsd" => "wheel",

4
ldap/templates/slapd.conf.erb
View file

@ -23,7 +23,8 @@ pidfile /var/run/openldap/slapd.pid
argsfile /var/run/openldap/slapd.args argsfile /var/run/openldap/slapd.args
# overlay modules to load # overlay modules to load
modulepath /usr/lib/openldap <% if scope.lookupvar('ldap::server::modulepath') != '' -%>
modulepath <%= modulepath %>
moduleload ppolicy.la moduleload ppolicy.la
moduleload syncprov.la moduleload syncprov.la
<% if has_variable?('ldap_server_modules') -%> <% if has_variable?('ldap_server_modules') -%>
@ -31,6 +32,7 @@ moduleload syncprov.la
moduleload <%= name %>.la moduleload <%= name %>.la
<% end -%> <% end -%>
<% end -%> <% end -%>
<% end -%>
# certificates # certificates
TLSCertificateFile <%= scope.lookupvar('ssl::certs') %>/slapd.crt TLSCertificateFile <%= scope.lookupvar('ssl::certs') %>/slapd.crt