From 0262ab4f2897b05fe323b11496faf7a28b81a83e Mon Sep 17 00:00:00 2001
From: Maxime Delorme <mdelorme@tennaxia.com>
Date: Mon, 16 Mar 2015 10:56:44 +0100
Subject: [PATCH 1/2] fix path to template to avoid using symlink that could
 not be created on windows and are not recommended by puppetlab

---
 manifests/client.pp        | 2 +-
 manifests/server/master.pp | 6 +++---
 manifests/server/slave.pp  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 609c537..d4d7a54 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -225,7 +225,7 @@
   }
 
   file { "${ldap::params::prefix}/${ldap::params::config}":
-    content => template("ldap/${ldap::params::prefix}/${ldap::params::config}.erb"),
+    content => template("ldap/etc/openldap/${ldap::params::config}.erb"),
     require => File[$ldap::params::prefix],
   }
 
diff --git a/manifests/server/master.pp b/manifests/server/master.pp
index 82c5565..ea608db 100644
--- a/manifests/server/master.pp
+++ b/manifests/server/master.pp
@@ -166,7 +166,7 @@
 
     file {"${ldap::params::prefix}/slapd.d/cn=config-update.ldif":
       ensure  => present,
-      content => template("ldap/${ldap::params::prefix}/slapd.d/cn=config-update.ldif.erb"),
+      content => template("ldap/etc/openldap/slapd.d/cn=config-update.ldif.erb"),
       require => Service[$ldap::params::service],
     }
 
@@ -184,7 +184,7 @@
 
   file { "${ldap::params::prefix}/${ldap::params::server_config}":
     ensure  => $ensure,
-    content => template("ldap/${ldap::params::prefix}/${ldap::params::server_config}.erb"),
+    content => template("ldap/etc/openldap/${ldap::params::server_config}.erb"),
     notify  => Service[$ldap::params::service],
     require => $ssl ? {
       false => [
@@ -245,7 +245,7 @@
 
   # Additional configurations (for rc scripts)
   case $::osfamily {
-    
+
     'Debian' : {
       class { 'ldap::server::debian': ssl => $ssl }
     }
diff --git a/manifests/server/slave.pp b/manifests/server/slave.pp
index 3d49c19..580b525 100644
--- a/manifests/server/slave.pp
+++ b/manifests/server/slave.pp
@@ -219,7 +219,7 @@
 
     file {"${ldap::params::prefix}/slapd.d/cn=config-update.ldif":
       ensure  => present,
-      content => template("ldap/${ldap::params::prefix}/slapd.d/cn=config-update.ldif.erb"),
+      content => template("ldap/etc/openldap/slapd.d/cn=config-update.ldif.erb"),
       require => Service[$ldap::params::service],
     }
 
@@ -237,7 +237,7 @@
 
   file { "${ldap::params::prefix}/${ldap::params::server_config}":
     ensure  => $ensure,
-    content => template("ldap/${ldap::params::prefix}/${ldap::params::server_config}.erb"),
+    content => template("ldap/etc/openldap/${ldap::params::server_config}.erb"),
     notify  => Service[$ldap::params::service],
     require => $ssl ? {
       false => [
@@ -298,7 +298,7 @@
 
   # Additional configurations (for rc scripts)
   case $::osfamily {
-    
+
     'Debian' : {
       class { 'ldap::server::debian': ssl => $ssl }
     }

From 04483119f458e9c4a082b37c55b876e9c6dcf6e0 Mon Sep 17 00:00:00 2001
From: Maxime Delorme <mdelorme@tennaxia.com>
Date: Mon, 16 Mar 2015 11:32:27 +0100
Subject: [PATCH 2/2] fix path to template to avoid using symlink that could
 not be created on windows and are not recommended by puppetlab

---
 templates/etc/ldap/ldap.conf.erb  | 1 -
 templates/etc/ldap/slapd.conf.erb | 1 -
 templates/etc/ldap/slapd.d        | 1 -
 3 files changed, 3 deletions(-)
 delete mode 120000 templates/etc/ldap/ldap.conf.erb
 delete mode 120000 templates/etc/ldap/slapd.conf.erb
 delete mode 120000 templates/etc/ldap/slapd.d

diff --git a/templates/etc/ldap/ldap.conf.erb b/templates/etc/ldap/ldap.conf.erb
deleted file mode 120000
index 0361f2a..0000000
--- a/templates/etc/ldap/ldap.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-../openldap/ldap.conf.erb
\ No newline at end of file
diff --git a/templates/etc/ldap/slapd.conf.erb b/templates/etc/ldap/slapd.conf.erb
deleted file mode 120000
index a6581c5..0000000
--- a/templates/etc/ldap/slapd.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-../openldap/slapd.conf.erb
\ No newline at end of file
diff --git a/templates/etc/ldap/slapd.d b/templates/etc/ldap/slapd.d
deleted file mode 120000
index abdc0b0..0000000
--- a/templates/etc/ldap/slapd.d
+++ /dev/null
@@ -1 +0,0 @@
-../openldap/slapd.d
\ No newline at end of file