gunnar: server/kolabd/kolabd/dist_conf kolab, 1.48, 1.49 kolabsrv.in, 1.7, 1.8

[cvs at kolab.org]

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: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- kolab	13 Oct 2007 11:51:08 -0000	1.48
+++ kolab	14 Oct 2007 12:31:58 -0000	1.49
@@ -137,15 +137,15 @@
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin
 webserver_sessions=${localstatedir}/kolab/httpd_sessions
-webserver_logdir=${localstatedir}/apache2/log
+webserver_logdir=${localstatedir}/apache/log
 webserver_acceptlock=${webserver_logdir}/accept.lock
 webserver_runtime_status=${webserver_logdir}/apache_runtime_status
 webserver_errorlogfile=${webserver_logdir}/apache-error.log
 webserver_accesslogfile=${webserver_logdir}/apache-access.log
-webserver_confdir=${sysconfdir}/apache2
-webserver_pidfile=${localstatedir}/apache2/run/apache2.pid
-webserver_mime_magicfile=${sysconfdir}/apache2/mime.magic
-webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
+webserver_confdir=${sysconfdir}/apache
+webserver_pidfile=${localstatedir}/apache/run/apache.pid
+webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
+webserver_mime_typesfile=${sysconfdir}/apache/mime.types
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 # webserver_web_prefix is empty indeed
@@ -153,9 +153,9 @@
 webserver_musr=${kolab_musr}
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
-webserver_rpm=apache2
+webserver_rpm=apache
 
-phpini_dir=${sysconfdir}/apache2
+phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php
 phplibdir2=${kolab_statedir}/php
 phppeardir=${phplibdir2}/pear
@@ -178,7 +178,7 @@
 resmgr_grp=${kolab_grp}
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
-freebusy_logfile=${localstatedir}/apache2/log/freebusy/freebusy.log
+freebusy_logfile=${localstatedir}/apache/log/freebusy/freebusy.log
 freebusy_confdir=${webserver_document_root}/freebusy
 freebusy_cachedir=${webserver_document_root}/freebusy/cache
 freebusy_usr=${kolab_musr}

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