diff options
Diffstat (limited to 'modules/openldap/manifests')
-rw-r--r-- | modules/openldap/manifests/config.pp | 2 | ||||
-rw-r--r-- | modules/openldap/manifests/init.pp | 2 | ||||
-rw-r--r-- | modules/openldap/manifests/slave_instance.pp | 2 | ||||
-rw-r--r-- | modules/openldap/manifests/var.pp | 6 |
4 files changed, 4 insertions, 8 deletions
diff --git a/modules/openldap/manifests/config.pp b/modules/openldap/manifests/config.pp index ee8a3187..336f8a23 100644 --- a/modules/openldap/manifests/config.pp +++ b/modules/openldap/manifests/config.pp @@ -2,6 +2,6 @@ define openldap::config($content) { file { $name: require => Package['openldap-servers'], content => $content, - notify => Exec["/etc/init.d/${openldap::var::service} check"], + notify => Exec["slaptest"], } } diff --git a/modules/openldap/manifests/init.pp b/modules/openldap/manifests/init.pp index 7f97aa59..34a214a2 100644 --- a/modules/openldap/manifests/init.pp +++ b/modules/openldap/manifests/init.pp @@ -8,7 +8,7 @@ class openldap { require => Openssl::Self_signed_cert["ldap.${::domain}"], } - exec { "/etc/init.d/${openldap::var::service} check": + exec { "slaptest": refreshonly => true, notify => Service[$openldap::var::service], } diff --git a/modules/openldap/manifests/slave_instance.pp b/modules/openldap/manifests/slave_instance.pp index 0d66d607..fbf998c6 100644 --- a/modules/openldap/manifests/slave_instance.pp +++ b/modules/openldap/manifests/slave_instance.pp @@ -1,5 +1,5 @@ # TODO create the user for sync in ldap -# this define is mainly syntaxic sugar +# this define is mainly syntactic sugar define openldap::slave_instance($rid) { include openldap class { 'openldap::slave': diff --git a/modules/openldap/manifests/var.pp b/modules/openldap/manifests/var.pp index 772ac22b..d6947eb8 100644 --- a/modules/openldap/manifests/var.pp +++ b/modules/openldap/manifests/var.pp @@ -1,7 +1,3 @@ class openldap::var { - if versioncmp($::lsbdistrelease, '4') < 0 { - $service = 'ldap' - } else { - $service = 'slapd' - } + $service = 'slapd' } |