diff options
| author | Michael Scherer <misc@mageia.org> | 2011-05-29 12:09:28 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-05-29 12:09:28 +0000 |
| commit | a2b9f58a22f444c800cb23870974461285a7ddc1 (patch) | |
| tree | 352e2656460fd3e51c68e6e66d96c01ecaba2c15 | |
| parent | 55b047af82c8f268c10c4b672da6aed4cc73739e (diff) | |
| download | puppet-a2b9f58a22f444c800cb23870974461285a7ddc1.tar puppet-a2b9f58a22f444c800cb23870974461285a7ddc1.tar.gz puppet-a2b9f58a22f444c800cb23870974461285a7ddc1.tar.bz2 puppet-a2b9f58a22f444c800cb23870974461285a7ddc1.tar.xz puppet-a2b9f58a22f444c800cb23870974461285a7ddc1.zip | |
split the configuration for the test database in another file ( to prepare for slave server )
| -rw-r--r-- | modules/openldap/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/openldap/templates/slapd.conf | 9 | ||||
| -rw-r--r-- | modules/openldap/templates/slapd.test.conf | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/modules/openldap/manifests/init.pp b/modules/openldap/manifests/init.pp index 417abd21..3d55cb5f 100644 --- a/modules/openldap/manifests/init.pp +++ b/modules/openldap/manifests/init.pp @@ -70,7 +70,7 @@ class openldap { } file { '/etc/openldap/slapd.conf': - content => template("openldap/slapd.conf"), + content => template("openldap/slapd.conf", "openldap/slapd.test.conf"), } file { '/etc/sysconfig/ldap': diff --git a/modules/openldap/templates/slapd.conf b/modules/openldap/templates/slapd.conf index 71721dc5..84600e36 100644 --- a/modules/openldap/templates/slapd.conf +++ b/modules/openldap/templates/slapd.conf @@ -112,13 +112,4 @@ access to dn.subtree="cn=Monitor" by group.exact="cn=LDAP Admins,ou=System Groups,<%= dc_suffix %>" read by * none -database bdb -suffix "dc=test_ldap" -directory /var/lib/ldap/test -rootdn "cn=manager,dc=test_ldap" -rootpw "<%= ldap_test_password %>" -authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth" - "cn=manager,dc=test_ldap" -# force ssl -security ssf=56 diff --git a/modules/openldap/templates/slapd.test.conf b/modules/openldap/templates/slapd.test.conf new file mode 100644 index 00000000..355efb8e --- /dev/null +++ b/modules/openldap/templates/slapd.test.conf @@ -0,0 +1,10 @@ +database bdb +suffix "dc=test_ldap" +directory /var/lib/ldap/test +rootdn "cn=manager,dc=test_ldap" +rootpw "<%= ldap_test_password %>" +authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth" + "cn=manager,dc=test_ldap" +# force ssl +security ssf=56 + |