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

Fixed "Unrecognised escape sequence" and "Deprecation notice" from ldap::server.

Browse source
This commit is contained in:
Timo Mkinen 2012-04-28 09:26:31 +03:00
parent 50f778a8e3
commit 3c862beaf5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ldap/manifests/init.pp
View file

@ -502,7 +502,7 @@ class ldap::server {
require => Exec["generate-slapd-schema-config"], require => Exec["generate-slapd-schema-config"],
} }
exec { "generate-slapd-schema-config": exec { "generate-slapd-schema-config":
command => "find ${config}/schema/*.schema -exec echo 'include {}' \; | sort -n > ${config}/slapd.conf.d/schema.conf", command => "find ${config}/schema/*.schema -exec echo 'include {}' \\; | sort -n > ${config}/slapd.conf.d/schema.conf",
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true, refreshonly => true,
notify => Service["slapd"], notify => Service["slapd"],
@ -520,7 +520,7 @@ class ldap::server {
notify => Service["slapd"], notify => Service["slapd"],
} }
exec { "generate-slapd-database-config": exec { "generate-slapd-database-config":
command => "find ${config}/slapd.conf.d/db.*.conf -exec echo 'include {}' \; > ${config}/slapd.conf.d/database.conf", command => "find ${config}/slapd.conf.d/db.*.conf -exec echo 'include {}' \\; > ${config}/slapd.conf.d/database.conf",
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true, refreshonly => true,
notify => Service["slapd"], notify => Service["slapd"],
@ -555,7 +555,7 @@ class ldap::server {
# moduleoptions => [ "smbkrb5pwd-enable=samba", ] # moduleoptions => [ "smbkrb5pwd-enable=samba", ]
# } # }
# #
define ldap::server::database($aclsource = "", $master = "", $syncpw = "", moduleoptions = []) { define ldap::server::database($aclsource = "", $master = "", $syncpw = "", $moduleoptions = []) {
include ldap::server include ldap::server