README.md

@@ -1,4 +1,4 @@
-# puppet-wmdeit\_ldap
+# puppet-wmdeit_ldap
 
 A puppet module to configure our OpenLDAP servers
 
@@ -6,31 +6,18 @@ To get it running:
 
     puppet module install camptocamp-openldap
 
-For lsc
-    puppet module install puppetlabs-java
-    puppet module install puppetlabs-apt
-    puppet generate types 
-
 For LAM
 
     puppet module install puppetlabs-apache
     puppet module install puppet-php
 
+
 Examples:
 
     class {"wmdeit_ldap":
         serverid => 17,
         simple_bind_tls => "0",
         log_level => 4,
-
-        # password for cn=config
-        configdn => "nc=admin,nc=config",
-        configpw => "123",
-
-        # database with rootdn and rootpw
-        database => "dc=wikimedia,dc=de",
-        rootdn => "cn=admin,dc=wikimedia,dc=de",
-        rootpw => "123",
     }
 
     class {"wmdeit_ldap::lam":

files/wmdeGroup.inc

@@ -3,8 +3,6 @@ use \LAM\TYPES\TypeManager;
 use function LAM\TYPES\getScopeFromTypeId;
 use LAM\TYPES\ConfiguredType;
 
-include_once "posixGroup.inc";
-
 class wmdeGroup extends posixGroup
 {
 	function display_html_attributes() {

manifests/init.pp

@@ -3,14 +3,14 @@
 class wmdeit_ldap (
 	$log_level = 0,
 
-	$configdn,
-	$configpw,
+	$configdn = 'cn=admin,cn=config',
+	$configpw = '123',
 	$syncrepl_providers = [
 	],
 
-	$database,
-	$rootdn, 
-	$rootpw,
+	$database = "dc=wikimedia,dc=de", 
+	$rootdn = "cn=admin,dc=wikimedia,dc=de",
+	$rootpw = "123",
 
 	$serverid, 
 	$simple_bind_tls = "128",
@@ -135,11 +135,11 @@ class wmdeit_ldap (
 
 		creates => "/etc/ldap/wmde.managed",
 		command => @(CMD/L),
-		/usr/sbin/service slapd stop &&
+		/sbin/service slapd stop &&
 		rm -rf '/etc/ldap/slapd.d/cn=config/cn=schema' &&
 		rm -rf '/etc/ldap/slapd.d/cn=config/cn=schema.ldif' &&
 		rm -rf '/etc/ldap/slapd.d/cn=config/olcDatabase={1}mdb.ldif' &&
-		/usr/sbin/service slapd start &&
+		/sbin/service slapd start &&
 		touch /etc/ldap/wmde.managed
 		| CMD
 	} 
@@ -237,6 +237,39 @@ class wmdeit_ldap (
 #		version => "8"
 #	}
 #
+	$java_home = "/usr/lib/jvm/jdk8u202-b08-jre"
+
+	java::adopt { 'jdk8' :
+		ensure  => 'present',
+		version => '8',
+		java => 'jre',
+	} ->  
+	apt::source { 'lsc':
+		location => 'http://lsc-project.org/debian',
+		repos    => 'main',
+		release => 'lsc',
+		key => {
+			id => "3FC3FD92ABA3975D2BEB95A70AC51F926D45BFC5",
+			source => "https://ltb-project.org/lib/RPM-GPG-KEY-LTB-project",
+		}
+	} ->
+	package {"lsc":
+		ensure => installed
+	} ->
+	file {"/etc/default/lsc":
+		ensure => file,
+		content => template("wmdeit_ldap/lsc.erb")
+	} ->
+	file {"/etc/lsc/lsc.xml":
+		ensure => file,
+		content => template("wmdeit_ldap/lsc.xml.erb")
+	} ->
+	service {"lsc":
+		ensure => running,
+		subscribe => File["/etc/lsc/lsc.xml"],
+	}
+
+
 
 #	openldap::server::globalconf { 'TLSVerifyClient':
 #		ensure  => present,

manifests/lsc.pp

@@ -1,38 +0,0 @@
-#
-
-class wmdeit_ldap::lsc ()
-inherits wmdeit_ldap
-
-{
-	$java_home = "/usr/lib/jvm/jdk8u202-b08-jre"
-
-	java::adopt { 'jdk8' :
-		ensure  => 'present',
-		version => '8',
-		java => 'jre',
-	} ->  
-	apt::source { 'lsc':
-		location => 'http://lsc-project.org/debian',
-		repos    => 'main',
-		release => 'lsc',
-		key => {
-			id => "3FC3FD92ABA3975D2BEB95A70AC51F926D45BFC5",
-			source => "https://ltb-project.org/lib/RPM-GPG-KEY-LTB-project",
-		}
-	} ->
-	package {"lsc":
-		ensure => installed
-	} ->
-	file {"/etc/default/lsc":
-		ensure => file,
-		content => template("wmdeit_ldap/lsc.erb")
-	} ->
-	file {"/etc/lsc/lsc.xml":
-		ensure => file,
-		content => template("wmdeit_ldap/lsc.xml.erb")
-	} ->
-	service {"lsc":
-		ensure => running,
-		subscribe => File["/etc/lsc/lsc.xml"],
-	}
-}