[debian-edu-commits] r82886 - branches/wheezy/debian-edu-config/share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2014-01-03 09:20:06 +0000 (Fri, 03 Jan 2014)
New Revision: 82886

Modified:
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/ldap-migrate-squeeze-wheezy
Log:
Improve recipe description.

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/ldap-migrate-squeeze-wheezy
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/ldap-migrate-squeeze-wheezy	2014-01-03 08:58:05 UTC (rev 82885)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/ldap-migrate-squeeze-wheezy	2014-01-03 09:20:06 UTC (rev 82886)
@@ -24,11 +24,13 @@
   # Get a copy of the current Wheezy LDAP database
   service slapd stop
   slapcat > wheezy-tjener.ldif
+  service slapd start                 # Restart local LDAP server
 
-  ldap-migrate-squeeze-wheezy       # Merge the two databases
-  slapadd < newtjener-slapadd.ldif  # Load the new/changed entries into LDAP
-  service slapd start               # Restart local LDAP server
+  ldap-migrate-squeeze-wheezy         # Merge the two databases
 
+  ldapadmindn=$(ldapsearch -H ldap://localhost/ -x "(&(cn=admin)(objectClass=simpleSecurityObject))" 2>/dev/null | perl -p0e 's/\n //g' | awk '/^dn: / {print $2}')
+  ldapmodify -H ldap://localhost/ -ZZ -D "$ldapadmindn" -W -v -x < newtjener-slapadd.ldif # Load the new/changed entries into LDAP
+
   # Copy home directories from old to new main-server
   rsync -av root at squeeze-tjener:/skole/tjener/home0/. /skole/tjener/home0/.