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

ldap: Fix ldap server on CentOS 7

Browse source
This commit is contained in:
Ossi Salmi 2015-09-12 01:00:52 +03:00
parent 0a387884fd
commit 0f5bb01b48
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ldap/manifests/init.pp
View file

@ -396,12 +396,12 @@ class ldap::server {
$user = "ldap" $user = "ldap"
$group = "ldap" $group = "ldap"
$package_name = $::operatingsystemrelease ? { $package_name = $::operatingsystemrelease ? {
/^5/ => [ "openldap-servers", "openldap-servers-overlays" ], /^5/ => [ "openldap-servers", "openldap-servers-overlays" ],
/^6/ => "openldap-servers", default => "openldap-servers",
} }
$service_name = $::operatingsystemrelease ? { $service_name = $::operatingsystemrelease ? {
/^5/ => "ldap", /^5/ => "ldap",
/^6/ => "slapd", default => "slapd",
} }
$config = "/etc/openldap" $config = "/etc/openldap"
$modulepath = $architecture ? { $modulepath = $architecture ? {
@ -473,7 +473,17 @@ class ldap::server {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat": { "centos","redhat": {
if $::operatinsystemrelease !~ /^5\./ { if versioncmp($::operatingsystemrelease, "7") > 0 {
file { "/etc/sysconfig/slapd":
ensure => present,
content => template("ldap/slapd.sysconfig.erb"),
mode => "0644",
owner => "root",
group => "root",
notify => Exec["slaptest"],
require => Package["openldap-server"],
}
} elsif versioncmp($::operatingsystemrelease, "6") > 0 {
file { "/etc/sysconfig/ldap": file { "/etc/sysconfig/ldap":
ensure => present, ensure => present,
content => template("ldap/ldap.sysconfig.erb"), content => template("ldap/ldap.sysconfig.erb"),

15
ldap/templates/slapd.sysconfig.erb Normal file
View file

@ -0,0 +1,15 @@
# OpenLDAP server configuration
# see 'man slapd' for additional information
# Where the server will run (-h option)
# - ldapi:/// is required for on-the-fly configuration using client tools
# (use SASL with EXTERNAL mechanism for authentication)
# - default: ldapi:/// ldap:///
# - example: ldapi:/// ldap://127.0.0.1/ ldap://10.0.0.1:1389/ ldaps:///
SLAPD_URLS="ldapi:/// ldap:/// ldaps:///"
# Any custom options
SLAPD_OPTIONS="-f /etc/openldap/slapd.conf<% if @ipv6enabled == 'false' %> -4<% end %>"
# Keytab location for GSSAPI Kerberos authentication
KRB5_KTNAME="FILE:/etc/openldap/ldap.keytab"