From 42652130b1eaafde1c468ac0b72fa1c20a10f4cd Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Wed, 18 Feb 2015 16:45:41 +0100
Subject: [PATCH] =?UTF-8?q?meta=20annuaire=20ajout=C3=A9=20par=20ldapvi=20?=
 =?UTF-8?q?(#6552)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/reset                                   | 9 ++++-----
 share/{config-meta.ldif => add-meta.ldapvi} | 9 +++++++--
 share/meta.ldif                             | 4 ----
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename share/{config-meta.ldif => add-meta.ldapvi} (64%)
 delete mode 100644 share/meta.ldif

diff --git a/lib/reset b/lib/reset
index d74cb05..fc3f9b9 100755
--- a/lib/reset
+++ b/lib/reset
@@ -63,12 +63,11 @@ slapadd -n0 -F/etc/ldap/slapd.d -l${LDIFDIR}/eduperson.ldif
 slapadd -n0 -F/etc/ldap/slapd.d -l${LDIFDIR}/eduorg-200210-openldap.ldif
 echo "ok"
 
-echo "Installation de la racine du méta-annuaire .. "
-slapadd -n0 -F/etc/ldap/slapd.d -l${LDIFDIR}/config-meta.ldif
-slapadd -n2 -F/etc/ldap/slapd.d -l${LDIFDIR}/meta.ldif
-echo "ok"
-
 chown -R openldap:openldap /etc/ldap/slapd.d /var/lib/ldap
 
 ${SERVICE} start
 
+echo "Installation de la racine du méta-annuaire (o=meta) .. "
+ldapvi --verbose --profile config --ldapmodify --ldapvi --add ${LDIFDIR}/add-meta.ldapvi
+echo "ok"
+
diff --git a/share/config-meta.ldif b/share/add-meta.ldapvi
similarity index 64%
rename from share/config-meta.ldif
rename to share/add-meta.ldapvi
index a6d5383..c1f4e9c 100644
--- a/share/config-meta.ldif
+++ b/share/add-meta.ldapvi
@@ -1,9 +1,14 @@
-dn: olcDatabase={2}mdb,cn=config
+add olcDatabase={2}mdb,cn=config
 objectClass: olcDatabaseConfig
 objectClass: olcMdbConfig
-olcSuffix: o=psl-meta
+olcSuffix: o=meta
 olcDbDirectory: /var/lib/ldap/meta/
 # Allow reading accesslog only by root
 olcAccess: {0}to *
    by dn.exact="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" write
    by * read
+
+add o=meta
+objectClass: organization
+o: meta
+description: Méta-annuaire SUPANN
diff --git a/share/meta.ldif b/share/meta.ldif
deleted file mode 100644
index 31992cf..0000000
--- a/share/meta.ldif
+++ /dev/null
@@ -1,4 +0,0 @@
-dn: o=psl-meta
-objectClass: organization
-o: psl-meta
-description: méta-annuaire supann PSL