thomas: server/kolabd/kolabd/dist_conf kolab,1.42,1.43
cvs at kolab.org
cvs at kolab.org
Tue Jul 17 17:07:17 CEST 2007
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv14170/kolabd/kolabd/dist_conf
Modified Files:
kolab
Log Message:
Adapt Kolab server for OpenPKG-CURRENT
(imported patch "openpkg-current" from 2.2-beta1 release)
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- kolab 11 Feb 2007 14:47:51 -0000 1.42
+++ kolab 17 Jul 2007 15:07:15 -0000 1.43
@@ -31,7 +31,7 @@
pkgdocdir=${datadir}/doc
# /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl/vendor_perl/5.8.7
+perllib=${libdir}/perl/vendor_perl/5.8.8
amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
amavisd_templatedir=${sysconfdir}/amavisd/templates
@@ -145,15 +145,15 @@
webserver_document_root=${localstatedir}/kolab/www
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/kolab/httpd_sessions
-webserver_logdir=${localstatedir}/apache/log
+webserver_logdir=${localstatedir}/apache2/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}/apache
-webserver_pidfile=${localstatedir}/apache/run/apache.pid
-webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
-webserver_mime_typesfile=${sysconfdir}/apache/mime.types
+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_sslscache=${webserver_logdir}/ssl_scache
webserver_sslmutex=${webserver_logdir}/ssl_mutex
# webserver_web_prefix is empty indeed
@@ -161,9 +161,9 @@
webserver_musr=kolab
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}
-webserver_rpm=apache
+webserver_rpm=apache2
-phpini_dir=${sysconfdir}/apache
+phpini_dir=${sysconfdir}/apache2
phplibdir=${libdir}/php
phplibdir2=${kolab_statedir}/php
phppeardir=${phplibdir2}/pear
More information about the commits
mailing list