martin: server/kolabd/kolabd/dist_conf common, 1.4, 1.5 kolab, 1.4, 1.5

cvs at intevation.de cvs at intevation.de
Mon Dec 5 17:21:36 CET 2005


Author: martin

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

Modified Files:
	common kolab 
Log Message:
Martin Konold: Applying patch from https://intevation.de/roundup/kolab/issue1017


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common	27 Nov 2005 23:57:02 -0000	1.4
+++ common	5 Dec 2005 16:21:34 -0000	1.5
@@ -54,6 +54,7 @@
 	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
 	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
 	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \
+	-e 's,[@]imap_confperm[@],$(imap_confperm),g' \
 	-e 's,[@]imap_grp[@],$(imap_grp),g' \
 	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
@@ -62,6 +63,7 @@
 	-e 's,[@]imap_spool[@],$(imap_spool),g' \
 	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
 	-e 's,[@]imap_usr[@],$(imap_usr),g' \
+	-e 's,[@]kolab_gid[@],$(kolab_gid),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
 	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
 	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
@@ -70,6 +72,7 @@
 	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
 	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
 	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
+	-e 's,[@]kolab_statedir[@],$(kolab_statedir),g' \
 	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
 	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
 	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
@@ -99,7 +102,6 @@
 	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
 	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
 	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
-	-e 's,[@]webserver_phpdir[@],$(webserver_phpdir),g' \
 	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
 	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
 	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab	27 Nov 2005 23:57:02 -0000	1.4
+++ kolab	5 Dec 2005 16:21:34 -0000	1.5
@@ -98,7 +98,6 @@
 imap_sievedir=${imap_statedir}/sieve
 imap_lmtp=${imap_statedir}/lmtp
 
-kolabd_usr=root
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/kolab.pid
@@ -121,7 +120,6 @@
 
 webserver_document_root=${localstatedir}/kolab/www
 webserver_cgidir=${webserver_document_root}/cgi-bin
-webserver_phpdir=${localstatedir}/kolab/php
 webserver_sessions=${localstatedir}/kolab/httpd_sessions
 webserver_logdir=${localstatedir}/apache/log
 webserver_acceptlock=${webserver_logdir}/accept.lock





More information about the commits mailing list