Moved lsc into separate class
This commit is contained in:
parent
1e2f674116
commit
084a99d8f6
|
@ -3,14 +3,14 @@
|
|||
class wmdeit_ldap (
|
||||
$log_level = 0,
|
||||
|
||||
$configdn = 'cn=admin,cn=config',
|
||||
$configpw = '123',
|
||||
$configdn,
|
||||
$configpw,
|
||||
$syncrepl_providers = [
|
||||
],
|
||||
|
||||
$database = "dc=wikimedia,dc=de",
|
||||
$rootdn = "cn=admin,dc=wikimedia,dc=de",
|
||||
$rootpw = "123",
|
||||
$database,
|
||||
$rootdn,
|
||||
$rootpw,
|
||||
|
||||
$serverid,
|
||||
$simple_bind_tls = "128",
|
||||
|
@ -135,11 +135,11 @@ class wmdeit_ldap (
|
|||
|
||||
creates => "/etc/ldap/wmde.managed",
|
||||
command => @(CMD/L),
|
||||
/sbin/service slapd stop &&
|
||||
/usr/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' &&
|
||||
/sbin/service slapd start &&
|
||||
/usr/sbin/service slapd start &&
|
||||
touch /etc/ldap/wmde.managed
|
||||
| CMD
|
||||
}
|
||||
|
@ -237,39 +237,6 @@ 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,
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
#
|
||||
|
||||
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"],
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue