richard: server/kolabd/kolabd/dist_conf suse, NONE, 1.1 common, 1.5, 1.6 kolab, 1.6, 1.7

cvs at intevation.de cvs at intevation.de
Sat Dec 17 12:10:33 CET 2005


Author: richard

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

Modified Files:
	common kolab 
Added Files:
	suse 
Log Message:
* dist_conf/common: replaced resmgr_filter with resmgr_filterdir and
  freebusy_cachefile with freebusy_cachedir
* dist_conf/kolab: reflect the changes made in dist_conf/common
* dist_conf/suse: added



--- NEW FILE: suse ---
# @l_nusr@
kolab_usr=kolab-n
# @l_ngrp@
kolab_grp=kolab-n
# @l_musr@
kolab_musr=kolab
# @l_mgrp@
kolab_mgrp=kolab
# @l_nuid@
kolab_uid=1002
# @l_ngid@
kolab_gid=1002
# @l_rusr@
restricted_kolab_usr=kolab-r
# @l_rgrp@
restricted_kolab_grp=kolab-r
kolab_rusr=${restricted_kolab_usr}
kolab_rgrp=${restricted_kolab_grp}
# @l_susr@
kolab_susr=root

BASH=/bin/bash
PERL=${bindir}/perl
PHP=${bindir}/php

kolab_rcdir=${sysconfdir}/init.d
pkgdocdir=${datadir}/doc/packages

# perl -V:sitelib | sed "s/.*'\(.*\)'\;/\1/"
perllib=${libdir}/perl5/site_perl/5.8.7

amavisd_confdir=${sysconfdir}/kolab/amavisd
amavisd_logfile=${localstatedir}/log/amavisd
amavisd_home=${localstatedir}/amavisd
# @l_rusr@
amavisd_rusr=kolab-r
# @l_musr@
amavisd_usr=kolab
# @l_rgrp@
amavisd_grp=kolab-r

fsl_logfile=${localstatedir}/log/fsl

sysrundir=${localstatedir}/run

clamav_confdir=${sysconfdir}/clamav
clamav_socket=${localstatedir}/clamav/clamd.sock
clamav_logfile=${localstatedir}/log/clamav
clamav_pidfile=${sysrundir}/clamd.pid
clamav_datadir=${datadir}/clamav
freshclam_logfile=${localstatedir}/log/freshclam.log
freshclam_pidfile=${sysrundir}/freshclam.pid
# @l_rusr@
clamav_rusr=${restricted_kolab_usr}
# @l_musr@
clamav_usr=kolab
# @l_rgrp@
clamav_grp=${restricted_kolab_usr}

# @l_musr@
postfix_usr=kolab
# @l_rgrp@
postfix_grp=kolab-r

emailscan_usr=${restricted_kolab_usr}
emailscan_grp=${restricted_kolab_grp}

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
emailserver_sasl_conffile=${sysconfdir}/sasl/apps/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_musr=kolab
emailserver_grp=${restricted_kolab_grp}
# @l_musr@
emailserver_mail_usr=kolab

ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/log/proftpd.log
ftpserver_confdir=${sysconfdir}/proftpd
ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
ftpserver_musr=kolab
ftpserver_usr=${kolab_usr}
ftpserver_grp=${kolab_grp}
# Why hardcoded uid/gid???
ftpserver_uid=19416
ftpserver_gid=19416

imap_confdir=${sysconfdir}/imapd
imap_confperm=0640
# @l_musr@
imap_usr=kolab
# @l_rgrp@
imap_grp=kolab-r
imap_masterlogfile=${localstatedir}/log/imapd/master.log
imap_misclogfile=${localstatedir}/log/imapd/misc.log
imap_statedir=${localstatedir}/imapd
imap_spool=${imap_statedir}/spool
imap_sievedir=${imap_statedir}/sieve
imap_lmtp=${imap_statedir}/lmtp

kolab_statedir=${localstatedir}/kolab
kolab_logdir=${localstatedir}/log
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=$(kolab_statedir)/mailbox-uidcache.db

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=${sysrundir}/slapd.pid
ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
ldapserver_schemadir=${sysconfdir}/openldap/schema
ldapserver_confdir=${sysconfdir}/openldap
# @l_musr@
ldapserver_usr=kolab
# @l_mgrp@
ldapserver_grp=kolab

webserver_document_root=/srv/www/htdocs
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/kolab/httpd_sessions
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}/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_musr=kolab
webserver_usr=${kolab_usr}
webserver_grp=${kolab_grp}

phplibdir=${libdir}/php
phplibdir2=${kolab_statedir}/php

sasl_confdir=${sysconfdir}/sasl
sasl_logfile=${localstatedir}/sasl/log/saslauthd.log

resmgr_logfile=${localstatedir}/resmgr/resmgr.log
resmgr_confdir=${sysconfdir}/resmgr
resmgr_filterdir=${localstatedir}/resmgr/filter
# @l_musr@
resmgr_usr=kolab
# @l_ngrp@
resmgr_grp=kolab-n

fbview_logfile=${localstatedir}/resmgr/fbview.log
freebusy_logfile=${localstatedir}/resmgr/freebusy.log
freebusy_cachedir=${webserver_document_root}/freebusy/cache

graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- common	5 Dec 2005 16:21:34 -0000	1.5
+++ common	17 Dec 2005 11:10:31 -0000	1.6
@@ -39,7 +39,7 @@
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
 	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
-	-e 's,[@]freebusy_cachefile[@],$(freebusy_cachefile),g' \
+	-e 's,[@]freebusy_cachedir[@],$(freebusy_cachedir),g' \
 	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
 	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
 	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
@@ -91,7 +91,7 @@
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
-	-e 's,[@]resmgr_filter[@],$(resmgr_filter),g' \
+	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
 	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab	10 Dec 2005 21:57:11 -0000	1.6
+++ kolab	17 Dec 2005 11:10:31 -0000	1.7
@@ -150,7 +150,7 @@
 
 resmgr_logfile=${localstatedir}/resmgr/resmgr.log
 resmgr_confdir=${sysconfdir}/resmgr
-resmgr_filter=${localstatedir}/resmgr/filter
+resmgr_filterdir=${localstatedir}/resmgr/filter
 # @l_musr@
 resmgr_usr=kolab
 # @l_ngrp@
@@ -158,7 +158,7 @@
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logfile=${localstatedir}/resmgr/freebusy.log
-freebusy_cachefile=${webserver_document_root}/freebusy/cache
+freebusy_cachedir=${webserver_document_root}/freebusy/cache
 
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db





More information about the commits mailing list