Merge branch 'master' of https://bitbucket.org/tmakinen/puppet

2013-03-27 07:46:01 +00:00 · 2013-03-27 07:46:01 +00:00 · a6151e95a1
commit a6151e95a1
parent fabbdbbeb4 d42b2989b8
15 changed files with 552 additions and 29 deletions
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@ -486,7 +486,7 @@ class ldap::server {
    }

    exec { "slaptest":
-        command     => "slaptest",
+        command     => "slaptest -f ${config}/slapd.conf",
        path        => "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
        refreshonly => true,
        require     => File["${config}/slapd.conf.d"],