1 files changed, 22 insertions, 59 deletions
diff --git a/modules/openldap/manifests/init.pp b/modules/openldap/manifests/init.pp
index 991aee40..34a214a2 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -1,71 +1,34 @@
 class openldap {
-    class base {
-        package { 'openldap-servers':
-            ensure => installed 
-        }
+    include openldap::var
 
-        service { ldap:
-            ensure => running,
-            subscribe => [ Package['openldap-servers']],
-            path => "/etc/init.d/ldap"
-        }
+    package { 'openldap-servers': }
 
-        file {"/etc/ssl/openldap/":
-            ensure => directory,
-            owner => root,
-            group => root,
-            mode => 755,
-        }
-
-        openssl::self_signed_cert{ 'ldap':
-            directory => "/etc/ssl/openldap/"
-        }
+    service { $openldap::var::service:
+        subscribe => Package['openldap-servers'],
+        require   => Openssl::Self_signed_cert["ldap.${::domain}"],
     }
 
-    # /etc/
-    # 11:57:48|  blingme> misc: nothing special, just copy slapd.conf, mandriva-dit-access.conf across, slapcat one side, slapadd other side
-
-    file { '/etc/openldap/slapd.conf':
-        ensure => present,
-        owner => root,
-        group => root,
-        mode => 644,
-        require => Package["openldap-servers"],
-        content => "",
-        notify => [Service['ldap']]
+    exec { "slaptest":
+        refreshonly => true,
+        notify      => Service[$openldap::var::service],
     }
 
-    file { '/etc/openldap/mandriva-dit-access.conf':
-        ensure => present,
-        owner => root,
-        group => root,
-        mode => 644,
-        require => Package["openldap-servers"],
-        content => "",
-        notify => [Service['ldap']]
+    file { '/etc/ssl/openldap/':
+        ensure => directory,
     }
 
-    file { '/etc/sysconfig/ldap':
-        ensure => present,
-        owner => root,
-        group => root,
-        mode => 644,
-        require => Package["openldap-servers"],
-        content => "",
-        notify => [Service['ldap']]
-    } 
-
-    class master inherits base {
-        file { '/etc/openldap/mandriva-dit-access.conf':
-            content => template("openldap/mandriva-dit-access.conf"),
-        }
-
-        file { '/etc/openldap/slapd.conf':
-            content => template("openldap/slapd.conf"),
-        }
+    openssl::self_signed_cert{ "ldap.${::domain}":
+        directory => '/etc/ssl/openldap/',
+    }
 
-        file { '/etc/sysconfig/ldap':
-            content => template("openldap/ldap.sysconfig"),
-        }
+    openldap::config {
+        '/etc/openldap/slapd.conf':
+            content => '';
+        '/etc/openldap/mandriva-dit-access.conf':
+            content => '';
+        '/etc/sysconfig/ldap':
+            content => '';
+        '/etc/sysconfig/slapd':
+            content => '';
     }
 }