Branch '2.3-stable' - 1st.README

[Thomas Arendsen Hein]

 1st.README |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 06d76278a030e7c676e2091c7c121d1bf394cd06
Author: Thomas Arendsen Hein <thomas at intevation.de>
Date:   Fri Apr 15 11:08:42 2011 +0200

    1st.README: Repair and simplify cn2uid conversion

diff --git a/1st.README b/1st.README
index 86d6230..f23365d 100644
--- a/1st.README
+++ b/1st.README
@@ -224,19 +224,16 @@ otherwise your setup might seem to work fine, but will not work reliably!
     If you want to convert your existing LDAP, please run the following
     commands as root:
 
-    # if [ -f ~/kolab-new.ldif ]; then
-        mv ~/kolab-new.ldif ~/kolab-dn-cn.ldif
-      else
-        cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
-      fi
+    # mv ~/kolab-update.ldif ~/kolab-dn-cn.ldif || \
+      cp ~/kolab-2.2.4.ldif ~/kolab-dn-cn.ldif
     # (umask 077 && /kolab/bin/php \
-       kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-new.ldif)
+       kolab-cn2uid -i ~/kolab-dn-cn.ldif -o ~/kolab-update.ldif)
 
 9.  Before starting the LDAP server the database must be restored from
     the ldif:
 
     # rm /kolab/var/openldap/openldap-data/*
-    # /kolab/sbin/slapadd -l ~/kolab-new.ldif
+    # /kolab/sbin/slapadd -l ~/kolab-update.ldif
 
 10. Manually transfer local changes of templates from .rpmsave into the
     new templates and remove all .rpmsave files below /kolab/etc as