[Kolab-devel] gunnar: server/kolabd/kolabd/dist_conf kolab, 1.48, 1.49 kolabsrv.in, 1.7, 1.8

[Thomas Arendsen Hein]

* Marcus Hüwe <suse-tux at gmx.de> [20071022 19:36]:
> On 2007-10-14 14:32:00 +0200, cvs at kolab.org wrote:
> > Author: gunnar
> > 
> > Update of /kolabrepository/server/kolabd/kolabd/dist_conf
> > In directory doto:/tmp/cvs-serv28173/kolabd/kolabd/dist_conf
> > 
> > Modified Files:
> > 	kolab kolabsrv.in 
> > Log Message:
> > OpenPKG renamed apache2 back to apache.
> > 
> > Index: kolabsrv.in
> > ===================================================================
> > RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
> > retrieving revision 1.7
> > retrieving revision 1.8
> > diff -u -d -r1.7 -r1.8
> > --- kolabsrv.in	11 Mar 2006 21:39:16 -0000	1.7
> > +++ kolabsrv.in	14 Oct 2007 12:31:58 -0000	1.8
> > @@ -38,7 +38,7 @@
> >  esac
> >  
> >  if [[ "$2" == "all" ]]; then
> > -	SERVICES="@LDAPD@ slurpd saslauthd spamd amavis apache2 freshclam clamd cyrus postfix"
> > +	SERVICES="@LDAPD@ slurpd saslauthd spamd amavis apache freshclam clamd cyrus postfix"
> >  	SERVICES="$SERVICES kolabd"
> >  else
> >  	SERVICES=$2
> > 
> 
> Is this change needed? If kolab is installed into an openpkg
> environment this file isn't used and the other distributions
> normally use apache2 (at least suse and gentoo do:) ). If not
> we should introduce a new variable like "APACHED" and add it
> to the dist_conf/common file.

Good catch, this change really isn't needed, please revert it.

Even server 2.1.0 has "apache2" here, but I renamed all occurrences
of 'apache' to 'apache2' for server 2.2-beta1, because OpenPKG
changed the name. Because they changed it back again before -beta2,
Gunnar changed every 'apache2' back to 'apache', which introduced
this change.

Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Osnabrueck - Register: Amtsgericht Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner