[Kolab-devel] [issue979] kolab_bootstrap of kolab 2.1 HEAD whille installing slave servers

[Marcus Hüwe]

On Tue, 15 Nov 2005 22:38:24 +0100
Richard Bos <radoeka at xs4all.nl> wrote:

> Op zondag 13 november 2005 22:00, schreef Richard Bos:
> > Assigned a patch for the problem reported in this problem.  The
> > patch results in the following diff (between current cvs and my
> > version):
> >
> > diff -ur kolabd/kolabd/ME/kolab/etc/kolab/kolab_bootstrap
> > kolabd.cvs/kolabd/ME/kolab/etc/kolab/kolab_bootstrap
> > --- kolabd/kolabd/ME/kolab/etc/kolab/kolab_bootstrap    2005-11-13
> > 21:34:07.000000000 +0100
> > +++ kolabd.cvs/kolabd/ME/kolab/etc/kolab/kolab_bootstrap
> >  2005-11-13 21:51:14.000000000 +0100
> > @@ -819,7 +819,7 @@
> >  of kolabhosts on the master before proceeding.
> >  EOS
> >    kolab_system("ssh -CA $master_host /kolab/bin/openpkg rc openldap
> > stop"); -  kolab_system("ssh -CA $master_host /kolab/lib/openpkg/tar
> > -C /kolab/etc/openldap -pcf - openldap-data | /kolab/lib/openpkg/tar
> > -C /kolab/etc/openldap -pxf -");
> > +  kolab_system("ssh -CA $master_host /kolab/lib/openpkg/tar
> > -C /kolab/var/openldap -pcf - openldap-data | /kolab/lib/openpkg/tar
> > -C /kolab/var/openldap -pxf -");
> >    kolab_system("ssh -CA $master_host /kolab/bin/openpkg rc openldap
> > start");
> >
> >    print "Updating configuration, please ignore any initial errors
> > from kolabconf\n\n";
> >
> > If you have a look at the patch it is actually bigger you would
> > expect.... The ChangeLog provides therefor the following
> > information:
> >
> > 2005-11-12 Richard Bos <richard at radoeka.nl>
> >         * Removed --enable-ldapconfdir and --enable-amavisdconfdir
> >           as these are defined in a dist_conf distribution file
> >         * Cleaned up dist_conf/common: put things in alphabetic
> > order => removed duplicated lines and combined variables that are
> > used for the same purpose:
> >           amavisd_confdir for amavisdconfdir and
> >           ldapserver_confdir for ldapconfdir
> >         * renamed postfix_logfile to emailserver_logfile to make it
> >           consistent with the rest of the variables
> >         * Added ldapserver_statedir and used this variable in the
> > definition of: ldapserver_dir, ldapserver_replogfile,
> > ldapserver_argsfile ldapserver_logfile and ldapserver_rundir
> >         * Altered @ldapserver_confdir@ to @ldapserver_statedir@, in
> >           kolab_bootstrap.in solving issue979
> >         * Reflected the changes above in other files
> >         * Make 'make distcheck' work by adding $srcdir to the
> > distribution line in configure.ac
> 
> 
> Can this patch be committed to cvs please.  I have another patch (see
> below) that depends on on the one mentioned above!  The new patch is
> for kolab-webadmin and it needs a updated kolabd/dist_conf
> directory.  It means that I can only create the correct diff against
> cvs if the one above has been applied.
> 
> The new patch is attached, so you can review it already but it is not
> complete as it need kolabd updates too!
> 
> 
> 2005-11-15 Richard
>         * bootstrap: copy the dist_conf file from kolabd instead of
>           perl-kolab
>         * configure.ac: removed the options: --enable-wsdocrootdir,
>           --phpdir and pkgdocdir.  These are all defined in the
>           kolab/dist_conf files
>           Added $srcdir to the distribution lines
>         * Makefile.am: replaced do_subst by @common@ (include the
> dist_conf file), reflected this change in configure.ac as well
>           Replaced wsdocrootdir by webserver_document_root
>           Renamed wsadmin... to the more appropriate name wskolab...
>           Replaced phpdir by phplibdir2
>           Renamed phpadmin... to the more appropriate name phpkolab
>           Added prefix dist_ to dist_phplocaleXX_DATA variables so
>           make distcheck completes
>           Removed test -z "$(webserver_usr)" || chown $(webserver_usr)
>           so make distcheck completes.  This should be handled by rpm
> or an external script.  In case an rpm is build it is very likely
>           that the user used in chown is not present.
>         * php/admin/include/config.php.in: changed phpdir to
> phplibdir2
> 
> 
> After this patch (including the one needed for kolabd) is applied I
> checked the output.  There is no diff between the current cvs version
> and kolab-webadmin with patch.  So it looks save to commit this patch
> and the one provided in the previous email.
> 
> 
It would be nice if the patch can committed to cvs because then i can
work at the resource-handlers module(atm i don't know which variables
i should use because some variables are changed (see Richards' patch)).
It seems that the patch works without problems.

marcus at linux:~/server> patch -p0 < ../kolab-webadmin.patch
patching file kolabd/kolabd/ChangeLog
patching file kolabd/kolabd/Makefile.am
patching file kolabd/kolabd/configure.ac
patching file kolabd/kolabd/kolab_bootstrap.in
patching file kolabd/kolabd/dist_conf/common
patching file kolabd/kolabd/dist_conf/kolab
patching file kolabd/kolabd/namespace/libexec/showlog.in
patching file kolabd/kolabd/templates/slapd.replicas.template.in
patching file perl-kolab/Kolab-Conf/Conf.pm
patching file kolab-webadmin/kolab-webadmin/ChangeLog
patching file kolab-webadmin/kolab-webadmin/Makefile.am
patching file kolab-webadmin/kolab-webadmin/bootstrap
patching file kolab-webadmin/kolab-webadmin/configure.ac
patching file
kolab-webadmin/kolab-webadmin/php/admin/include/config.php.in
marcus at linux:~/server>


Cheers Marcus