martin: server/kolabd/kolabd/dist_conf common, 1.2, 1.3 kolab, 1.2, 1.3

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv14922/kolabd/dist_conf

Modified Files:
	common kolab 
Log Message:
Martin Konold: Commited patch from Richard (patch looks perfectly fine and needs some exposure to testing)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common	22 Nov 2005 14:21:58 -0000	1.2
+++ common	27 Nov 2005 11:58:41 -0000	1.3
@@ -8,6 +8,7 @@
 	-e 's,[@]libexecdir[@],$(libexecdir),g' \
 	-e 's,[@]localstatedir[@],$(localstatedir),g' \
 	-e 's,[@]phplibdir[@],$(phplibdir),g' \
+	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
 	-e 's,[@]bash_exec[@],$(bash_exec),g' \
 	-e 's,[@]perl_exec[@],$(perl_exec),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab	22 Nov 2005 14:21:58 -0000	1.2
+++ kolab	27 Nov 2005 11:58:41 -0000	1.3
@@ -19,7 +19,6 @@
 # @l_susr@
 kolab_susr=root
 
-
 kolab_rcdir=${sysconfdir}/rc.d
 
 bash_exec=${libdir}/openpkg/bash
@@ -99,10 +98,10 @@
 imap_lmtp=${imap_statedir}/lmtp
 
 kolabd_usr=root
-kolab_logdir=${localstatedir}/kolab/log
 kolab_statedir=${localstatedir}/kolab
-kolab_pidfile=${localstatedir}/kolab/kolab.pid
-kolab_mailboxuiddb=$(localstatedir)/kolab/mailbox-uidcache.db
+kolab_logdir=${kolab_statedir}/log
+kolab_pidfile=${kolab_statedir}/kolab.pid
+kolab_mailboxuiddb=$(kolab_statedir)/mailbox-uidcache.db
 
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data
@@ -123,7 +122,6 @@
 webserver_cgidir=${webserver_document_root}/cgi-bin
 webserver_phpdir=${localstatedir}/kolab/php
 webserver_sessions=${localstatedir}/kolab/httpd_sessions
-phplibdir=${libdir}/php
 webserver_logdir=${localstatedir}/apache/log
 webserver_acceptlock=${webserver_logdir}/accept.lock
 webserver_runtime_status=${webserver_logdir}/apache_runtime_status
@@ -139,7 +137,8 @@
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
 
-webadmindir=${localstatedir}/kolab
+phplibdir=${libdir}/php
+phplibdir2=${kolab_statedir}/php
 
 sasl_confdir=${sysconfdir}/sasl
 sasl_logfile=${localstatedir}/sasl/log/saslauthd.log