From 871a98bc2a08d1ac2285630a2202bb9095d593c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Fri, 14 Jun 2013 07:35:53 +0300
Subject: [PATCH] ldap: Removed IPv6 support from server if IPv6 is not enabled
 on host.

---
 ldap/manifests/init.pp                                      | 2 +-
 ldap/{files/ldap.sysconfig => templates/ldap.sysconfig.erb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename ldap/{files/ldap.sysconfig => templates/ldap.sysconfig.erb} (82%)

diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index 51a23b7..5de7bbd 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -464,7 +464,7 @@ class ldap::server {
             if $::operatinsystemrelease !~ /^5\./ {
                 file { "/etc/sysconfig/ldap":
                     ensure  => present,
-                    source  => "puppet:///modules/ldap/ldap.sysconfig",
+                    content => template("ldap/ldap.sysconfig.erb"),
                     mode    => "0644",
                     owner   => "root",
                     group   => "root",
diff --git a/ldap/files/ldap.sysconfig b/ldap/templates/ldap.sysconfig.erb
similarity index 82%
rename from ldap/files/ldap.sysconfig
rename to ldap/templates/ldap.sysconfig.erb
index a9f59e2..00ded90 100644
--- a/ldap/files/ldap.sysconfig
+++ b/ldap/templates/ldap.sysconfig.erb
@@ -1,5 +1,5 @@
 # Options of slapd (see man slapd)
-SLAPD_OPTIONS="-f /etc/openldap/slapd.conf"
+SLAPD_OPTIONS="-f /etc/openldap/slapd.conf<% if @ipv6enabled == 'false' %> -4<% end %>"
 
 # At least one of SLAPD_LDAP, SLAPD_LDAPI and SLAPD_LDAPS must be set to 'yes'!
 #