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

Fixed ldap::server for Ubuntu.

Browse source
This commit is contained in:
Timo Mkinen 2013-01-03 18:48:20 +02:00
parent 32c9f9d667
commit eb423748ee
3 changed files with 81 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

43
ldap/manifests/init.pp
View file

@ -357,6 +357,14 @@ class ldap::server {
$service_name = "slapd"
$config = "/etc/ldap"
$modulepath = "/usr/lib/ldap"
$rundir = "/var/run/slapd"
exec { "usermod-openldap":
path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "usermod -a -G ssl-cert openldap",
unless => "id -n -G openldap | grep '\\bssl-cert\\b'",
require => Package["openldap-server"],
before => Service["slapd"],
}
}
"fedora": {
$user = "ldap"
@ -368,6 +376,7 @@ class ldap::server {
"x86_64" => "/usr/lib64/openldap",
default => "/usr/lib/openldap",
}
$rundir = "/var/run/openldap"
}
"centos","redhat": {
$user = "ldap"
@ -385,6 +394,7 @@ class ldap::server {
"x86_64" => "/usr/lib64/openldap",
default => "/usr/lib/openldap",
}
$rundir = "/var/run/openldap"
}
"openbsd": {
$user = "_openldap"
@ -393,6 +403,7 @@ class ldap::server {
$service_name = "slapd"
$config = "/etc/openldap"
$modulepath = ""
$rundir = "/var/run/openldap"
}
}
@ -446,15 +457,29 @@ class ldap::server {
notify => Exec["generate-slapd-database-config"],
}
if $::operatingsystem in ["CentOS","RedHat"] and $operatinsystemrelease !~ /^5\./ {
file { "/etc/sysconfig/ldap":
ensure => present,
source => "puppet:///modules/ldap/ldap.sysconfig",
mode => "0644",
owner => "root",
group => "root",
notify => Service["slapd"],
require => Package["openldap-server"],
case $::operatingsystem {
"centos","redhat": {
if $::operatinsystemrelease !~ /^5\./ {
file { "/etc/sysconfig/ldap":
ensure => present,
source => "puppet:///modules/ldap/ldap.sysconfig",
mode => "0644",
owner => "root",
group => "root",
notify => Service["slapd"],
require => Package["openldap-server"],
}
}
}
"debian","ubuntu": {
file { "/etc/default/slapd":
source => "puppet:///modules/ldap/slapd.default",
mode => "0644",
owner => "root",
group => "root",
notify => Service["slapd"],
require => Package["openldap-server"],
}
}
}