aboutsummaryrefslogtreecommitdiffstats
path: root/modules/openldap
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-08-17 16:41:19 +0000
committerMichael Scherer <misc@mageia.org>2011-08-17 16:41:19 +0000
commitef42352d03eda95795791e369c0b17b4cd26f9ac (patch)
tree7a3e6a1484cfbd64c883a23ce2bf932d0b1f5f61 /modules/openldap
parente8effe4803ba3a92199e43f6a663ebc9d43f8d9e (diff)
downloadpuppet-ef42352d03eda95795791e369c0b17b4cd26f9ac.tar
puppet-ef42352d03eda95795791e369c0b17b4cd26f9ac.tar.gz
puppet-ef42352d03eda95795791e369c0b17b4cd26f9ac.tar.bz2
puppet-ef42352d03eda95795791e369c0b17b4cd26f9ac.tar.xz
puppet-ef42352d03eda95795791e369c0b17b4cd26f9ac.zip
fix inheritance ( worked by chance before )
Diffstat (limited to 'modules/openldap')
-rw-r--r--modules/openldap/manifests/init.pp69
1 files changed, 33 insertions, 36 deletions
diff --git a/modules/openldap/manifests/init.pp b/modules/openldap/manifests/init.pp
index 177b0655..14775a36 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -21,43 +21,40 @@ class openldap {
openssl::self_signed_cert{ "ldap.$domain":
directory => "/etc/ssl/openldap/"
}
- }
- # /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']]
+ }
- file { '/etc/openldap/slapd.conf':
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- require => Package["openldap-servers"],
- content => "",
- notify => [Service['ldap']]
- }
+ 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/openldap/mandriva-dit-access.conf':
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- require => Package["openldap-servers"],
- content => "",
- notify => [Service['ldap']]
+ file { '/etc/sysconfig/ldap':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ require => Package["openldap-servers"],
+ content => "",
+ notify => [Service['ldap']]
+ }
}
- file { '/etc/sysconfig/ldap':
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- require => Package["openldap-servers"],
- content => "",
- notify => [Service['ldap']]
- }
-
class master inherits common {
- file { '/etc/openldap/mandriva-dit-access.conf':
+ File { '/etc/openldap/mandriva-dit-access.conf':
content => template("openldap/mandriva-dit-access.conf"),
}
@@ -71,11 +68,11 @@ class openldap {
before => Service['ldap'],
}
- file { '/etc/openldap/slapd.conf':
+ File { '/etc/openldap/slapd.conf':
content => template("openldap/slapd.conf", "openldap/slapd.test.conf"),
}
- file { '/etc/sysconfig/ldap':
+ File { '/etc/sysconfig/ldap':
content => template("openldap/ldap.sysconfig"),
}
}
@@ -95,15 +92,15 @@ class openldap {
$sync_password = extlookup("ldap_syncuser-$hostname",'x')
# same access rights as master
- file { '/etc/openldap/mandriva-dit-access.conf':
+ File { '/etc/openldap/mandriva-dit-access.conf':
content => template("openldap/mandriva-dit-access.conf"),
}
- file { '/etc/openldap/slapd.conf':
+ File { '/etc/openldap/slapd.conf':
content => template("openldap/slapd.conf",'openldap/slapd.syncrepl.conf'),
}
- file { '/etc/sysconfig/ldap':
+ File { '/etc/sysconfig/ldap':
content => template("openldap/ldap.sysconfig"),
}
}