steffen: server/kolabd/kolabd/dist_conf common, 1.1, 1.2 kolab, 1.1, 1.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	common kolab 
Log Message:
Patch from issue979 applied, thanks Richard

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common	13 Sep 2005 14:38:22 -0000	1.1
+++ common	22 Nov 2005 14:21:58 -0000	1.2
@@ -5,103 +5,100 @@
 	-e 's,[@]prefix[@],$(prefix),g' \
 	-e 's,[@]libdir[@],$(libdir),g' \
 	-e 's,[@]datadir[@],$(datadir),g' \
+	-e 's,[@]libexecdir[@],$(libexecdir),g' \
+	-e 's,[@]localstatedir[@],$(localstatedir),g' \
+	-e 's,[@]phplibdir[@],$(phplibdir),g' \
 	-e 's,[@]bash_exec[@],$(bash_exec),g' \
 	-e 's,[@]perl_exec[@],$(perl_exec),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
-	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
-	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
-	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
-	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
-	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
-	-e 's,[@]ldapserver_grp[@],$(ldapserver_grp),g' \
-	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
-	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
-	-e 's,[@]ftpserver_logfile[@],$(ftpserver_logfile),g' \
+	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
+	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
+	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
 	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
-	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
-	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
-	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
-	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
-	-e 's,[@]clamav_logfile[@],$(clamav_logfile),g' \
-	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
-	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
-	-e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
-	-e 's,[@]postfix_logfile[@],$(postfix_logfile),g' \
+	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
+	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
 	-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
-	-e 's,[@]clamav_usr[@],$(clamav_usr),g' \
+	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
 	-e 's,[@]clamav_grp[@],$(clamav_grp),g' \
 	-e 's,[@]clamav_logdir[@],$(clamav_logdir),g' \
+	-e 's,[@]clamav_logfile[@],$(clamav_logfile),g' \
 	-e 's,[@]clamav_pidfile[@],$(clamav_pidfile),g' \
-	-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
-	-e 's,[@]clamav_socket[@],$(clamav_socket),g' \
 	-e 's,[@]clamav_rusr[@],$(clamav_rusr),g' \
-	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \
-	-e 's,[@]imap_usr[@],$(imap_usr),g' \
-	-e 's,[@]imap_grp[@],$(imap_grp),g' \
-	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
-	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
-	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
-	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
-	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
-	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
-	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
-	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
-	-e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
-	-e 's,[@]webserver_usr[@],$(webserver_usr),g' \
-	-e 's,[@]webserver_grp[@],$(webserver_grp),g' \
-	-e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
-	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
-	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
-	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
-	-e 's,[@]webserver_runtime_status[@],$(webserver_runtime_status),g' \
-	-e 's,[@]webserver_pidfile[@],$(webserver_pidfile),g' \
-	-e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
-	-e 's,[@]webserver_errorlogfile[@],$(webserver_errorlogfile),g' \
-	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
-	-e 's,[@]webserver_phpdir[@],$(webserver_phpdir),g' \
-	-e 's,[@]phplibdir[@],$(phplibdir),g' \
-	-e 's,[@]webserver_musr[@],$(webserver_musr),g' \
-	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
-	-e 's,[@]imap_spool[@],$(imap_spool),g' \
-	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
+	-e 's,[@]clamav_socket[@],$(clamav_socket),g' \
+	-e 's,[@]clamav_usr[@],$(clamav_usr),g' \
 	-e 's,[@]emailserver_confdir[@],$(emailserver_confdir),g' \
-	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]emailserver_grp[@],$(emailserver_grp),g' \
 	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
+	-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
 	-e 's,[@]emailserver_sasl_conffile[@],$(emailserver_sasl_conffile),g' \
-	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
-	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
-	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
-	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
+	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
+	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
-	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
+	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
+	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
+	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
+	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
 	-e 's,[@]ftpserver_confdir[@],$(ftpserver_confdir),g' \
-	-e 's,[@]ftpserver_musr[@],$(ftpserver_musr),g' \
-	-e 's,[@]ftpserver_grp[@],$(ftpserver_grp),g' \
-	-e 's,[@]ftpserver_usr[@],$(ftpserver_usr),g' \
-	-e 's,[@]ftpserver_uid[@],$(ftpserver_uid),g' \
 	-e 's,[@]ftpserver_gid[@],$(ftpserver_gid),g' \
+	-e 's,[@]ftpserver_grp[@],$(ftpserver_grp),g' \
+	-e 's,[@]ftpserver_logfile[@],$(ftpserver_logfile),g' \
+	-e 's,[@]ftpserver_musr[@],$(ftpserver_musr),g' \
 	-e 's,[@]ftpserver_scoreboardfile[@],$(ftpserver_scoreboardfile),g' \
-	-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
-	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
+	-e 's,[@]ftpserver_uid[@],$(ftpserver_uid),g' \
+	-e 's,[@]ftpserver_usr[@],$(ftpserver_usr),g' \
+	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
+	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
+	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \
+	-e 's,[@]imap_grp[@],$(imap_grp),g' \
+	-e 's,[@]imap_lmtp[@],$(imap_lmtp),g' \
 	-e 's,[@]imap_masterlogfile[@],$(imap_masterlogfile),g' \
 	-e 's,[@]imap_misclogfile[@],$(imap_misclogfile),g' \
+	-e 's,[@]imap_sievedir[@],$(imap_sievedir),g' \
+	-e 's,[@]imap_spool[@],$(imap_spool),g' \
+	-e 's,[@]imap_statedir[@],$(imap_statedir),g' \
+	-e 's,[@]imap_usr[@],$(imap_usr),g' \
 	-e 's,[@]kolab_grp[@],$(kolab_grp),g' \
-	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
-	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
-	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
+	-e 's,[@]kolab_mailboxuiddb[@],$(kolab_mailboxuiddb),g' \
+	-e 's,[@]kolab_mgrp[@],$(kolab_mgrp),g' \
+	-e 's,[@]kolab_musr[@],$(kolab_musr),g' \
+	-e 's,[@]kolab_pidfile[@],$(kolab_pidfile),g' \
+	-e 's,[@]kolab_rcdir[@],$(kolab_rcdir),g' \
+	-e 's,[@]kolab_rgrp[@],$(kolab_rgrp),g' \
+	-e 's,[@]kolab_rusr[@],$(kolab_rusr),g' \
+	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
+	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
 	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
-	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
+	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
+	-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \
+	-e 's,[@]ldapserver_grp[@],$(ldapserver_grp),g' \
+	-e 's,[@]ldapserver_logfile[@],$(ldapserver_logfile),g' \
 	-e 's,[@]ldapserver_pidfile[@],$(ldapserver_pidfile),g' \
-	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
-	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
-	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
-	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
-	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
-	-e 's,[@]libexecdir[@],$(libexecdir),g' \
-	-e 's,[@]ldapconfdir[@],$(ldapconfdir),g' \
-	-e 's,[@]amavisdconfdir[@],$(amavisdconfdir),g' \
-	-e 's,[@]localstatedir[@],$(localstatedir),g' \
-	-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g'
+	-e 's,[@]ldapserver_replogfile[@],$(ldapserver_replogfile),g' \
+	-e 's,[@]ldapserver_schemadir[@],$(ldapserver_schemadir),g' \
+	-e 's,[@]ldapserverslurpd_pidfile[@],$(ldapserverslurpd_pidfile),g' \
+	-e 's,[@]ldapserver_statedir[@],$(ldapserver_statedir),g' \
+	-e 's,[@]ldapserver_usr[@],$(ldapserver_usr),g' \
+	-e 's,[@]pkgdocdir[@],$(pkgdocdir),g' \
+	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
+	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
+	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
+	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
+	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
+	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
+	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
+	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \
+	-e 's,[@]webserver_confdir[@],$(webserver_confdir),g' \
+	-e 's,[@]webserver_document_root[@],$(webserver_document_root),g' \
+	-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' \
+	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
+	-e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
+	-e 's,[@]webserver_usr[@],$(webserver_usr),g'

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab	13 Sep 2005 14:38:22 -0000	1.1
+++ kolab	22 Nov 2005 14:21:58 -0000	1.2
@@ -56,7 +56,6 @@
 postfix_usr=kolab
 # @l_rgrp@
 postfix_grp=kolab-r
-postfix_logfile=${localstatedir}/postfix/log/postfix.log
 
 emailscan_usr=${restricted_kolab_usr}
 emailscan_grp=${restricted_kolab_grp}
@@ -64,6 +63,7 @@
 emailserver_confdir=${sysconfdir}/postfix
 emailserver_socket=${localstatedir}/kolab/lmtp
 emailserver_localstatedir=${localstatedir}/postfix
+emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
 emailserver_imapdir=${localstatedir}/imapd
 emailserver_imapspooldir=${localstatedir}/imapd/spool
 emailserver_sievedir=${localstatedir}/imapd/sieve
@@ -104,14 +104,15 @@
 kolab_pidfile=${localstatedir}/kolab/kolab.pid
 kolab_mailboxuiddb=$(localstatedir)/kolab/mailbox-uidcache.db
 
-ldapserver_dir=${localstatedir}/openldap/openldap-data
-ldapserver_rundir=${localstatedir}/openldap/run
+ldapserver_statedir=${localstatedir}/openldap
+ldapserver_dir=${ldapserver_statedir}/openldap-data
+ldapserver_replogfile=${ldapserver_statedir}/replog
+ldapserver_argsfile=${ldapserver_statedir}/slapd.args
+ldapserver_logfile=${ldapserver_statedir}/openldap.log
+ldapserver_rundir=${ldapserver_statedir}/run
 ldapserver_pidfile=${ldapserver_rundir}/slapd.pid
 ldapserverslurpd_pidfile=${ldapserver_rundir}/slurpd.pid
 ldapserver_schemadir=${sysconfdir}/openldap/schema
-ldapserver_replogfile=${localstatedir}/openldap/replog
-ldapserver_argsfile=${localstatedir}/openldap/slapd.args
-ldapserver_logfile=${localstatedir}/openldap/openldap.log
 ldapserver_confdir=${sysconfdir}/openldap
 # @l_musr@
 ldapserver_usr=kolab