thomas: server README.1st,1.92,1.93

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv3262

Modified Files:
	README.1st 
Log Message:
Started instructions for upgrading 2.2.0 -> 2.2.1-beta1


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- README.1st	25 Aug 2008 17:01:32 -0000	1.92
+++ README.1st	11 Dec 2008 12:00:33 -0000	1.93
@@ -96,16 +96,15 @@
 # sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
 
 If you installed without Horde or F/B-View you need to drop the
-corresponding flags again.
+corresponding flags again.  install-kolab.sh will usually automatically
+determine which packages need to be built.
 
-install-kolab.sh will usually automatically determine which packages
-need to be built.  If you have made changes to configuration files or
-an updated package includes configuration files which are usually
-regenerated from files in /kolab/etc/kolab/templates/ the old
-configuration file will be saved with the extension .rpmsave.  For
-files generated from templates you just have to remove the rpmsave
-file, because services will refuse to start if there still is an
-rpmsave file, e.g.:
+If you have made changes to configuration files or an updated package
+includes configuration files which are usually regenerated from files
+in /kolab/etc/kolab/templates/ the old configuration file will be saved
+with the extension .rpmsave.  For files generated from templates you
+just have to remove the rpmsave file, because services will refuse to
+start if there still is an rpmsave file, e.g.:
 
 # rm /kolab/etc/clamav/*.conf.rpmsave
 
@@ -152,10 +151,50 @@
 too.
 
 
-Upgrade from 2.2.0 to 2.2.1-rc1
--------------------------------
+Upgrade from 2.2.0 to 2.2.1-beta1
+---------------------------------
 
-Nothing special has to be done for this upgrade.
+0. Make a backup of your installation and data stored inside /kolab
+
+1. The Kolab server must be stopped:
+
+    # /kolab/bin/openpkg rc all stop
+
+2. Save the current LDAP data:
+
+   Copy the contents of the openldap database, use a different output
+   filename if you want. You should make sure that no other users can
+   read the sensitive data contained in the ldif file, e.g. with umask:
+
+   # umask 077
+   # /kolab/sbin/slapcat > ~/kolab-2.2.0.ldif
+
+3. Start the standard upgrade:
+   (as described in the General update instructions)
+
+   # sh install-kolab.sh 2>&1 | tee /root/kolab-update.log
+
+4. /kolab/etc/kolab/kolab.conf will be saved as kolab.conf.rpmsave,
+   please move it back to the original name:
+
+   # cd /kolab/etc/kolab && mv kolab.conf.rpmsave kolab.conf
+
+5. Look at *.conf.rpmsave files in the subdirectories of /kolab/etc/,
+   transfer your changes and remove these files.
+   (as described in the General update instructions)
+
+6. Before starting the LDAP server the database must be restored from
+   the ldif:
+
+   # rm /kolab/var/openldap/openldap-data/*
+   # /kolab/sbin/slapadd -l ~/kolab-2.2.0.ldif
+
+7. Start the OpenLDAP, generate the configuration files and start the
+   Kolab server:
+
+   # /kolab/bin/openpkg rc openldap start
+   # /kolab/sbin/kolabconf
+   # /kolab/bin/openpkg rc all start
 
 
 Upgrade from 2.2-rc3 to 2.2.0
@@ -241,11 +280,11 @@
 
 0.  Make a backup of your installation and data stored inside /kolab
 
-1.  Before upgrading the Kolab server must be stoped:
+1.  Before upgrading the Kolab server must be stopped:
 
     # /kolab/bin/openpkg rc all stop
 
-2.  Save the current ldap:
+2.  Save the current LDAP data:
 
     Copy the contents of the openldap database, use a different output
     filename if you want. You should make sure that no other users can