Skip to content
This repository has been archived by the owner on Oct 22, 2019. It is now read-only.

fix path to template to avoid using symlink #44

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix path to template to avoid using symlink #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0262ab4
fix path to template to avoid using symlink that could not be created…
maxdelorme Mar 16, 2015
0448311
fix path to template to avoid using symlink that could not be created…
maxdelorme Mar 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}

Expand Down
6 changes: 3 additions & 3 deletions manifests/server/master.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}

Expand All @@ -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 => [
Expand Down Expand Up @@ -245,7 +245,7 @@

# Additional configurations (for rc scripts)
case $::osfamily {

'Debian' : {
class { 'ldap::server::debian': ssl => $ssl }
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/server/slave.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}

Expand All @@ -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 => [
Expand Down Expand Up @@ -298,7 +298,7 @@

# Additional configurations (for rc scripts)
case $::osfamily {

'Debian' : {
class { 'ldap::server::debian': ssl => $ssl }
}
Expand Down
1 change: 0 additions & 1 deletion templates/etc/ldap/ldap.conf.erb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion templates/etc/ldap/slapd.conf.erb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion templates/etc/ldap/slapd.d
View file
Open in desktop

This file was deleted.