richard: server/kolabd/kolabd/dist_conf debian, NONE, 1.1 common, 1.10, 1.11 kolab, 1.14, 1.15 suse, 1.12, 1.13
cvs at intevation.de
cvs at intevation.de
Sun Jan 1 22:20:26 CET 2006
Author: richard
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv32097/dist_conf
Modified Files:
common kolab suse
Added Files:
debian
Log Message:
* dist_conf/debian: added (provided by Benoit Mortier)
* dist_conf/suse, dist_conf/kolab, dist_conf/common: added backupdir
* kolab_bootstrap.in: replaced $sysconfdir/kolab/backup with @backupdir@
Added webserver_web_prefix to the url that is to be used to reach
the admin page
--- NEW FILE: debian ---
kolab_usr=root
kolab_grp=root
kolab_musr=root
kolab_mgrp=root
kolab_uid=1002
kolab_gid=1002
restricted_kolab_usr=root
restricted_kolab_grp=root
kolab_rusr=${restricted_kolab_usr}
kolab_rgrp=${restricted_kolab_grp}
kolab_susr=root
BASHELL=/bin/bash
PERL=${bindir}/perl
PHP=${bindir}/php
KOLABRC=${sbindir}/kolab
kolab_rcdir=${sysconfdir}/init.d
pkgdocdir=${datadir}/doc/kolab
# perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
perllib=${libdir}/perl5
amavisd_confdir=${sysconfdir}/amavis/conf.d
amavisd_logfile=${localstatedir}/log/amavis.log
amavisd_home=${localstatedir}/lib//amavis
amavisd_rusr=kolab-r
amavisd_usr=kolab
amavisd_grp=kolab-r
fsl_logfile=${localstatedir}/log/fsl
sysrundir=${localstatedir}/run/amavis
clamav_confdir=${sysconfdir}/clamav
clamav_socket=${localstatedir}/clamav/clamd.sock
clamav_logfile=${localstatedir}/log/clamav/clamav.log
clamav_pidfile=${localstatedir}/run/amavis/clamd.pid
clamav_datadir=${localstatedir}/lib/clamav
freshclam_logfile=${localstatedir}/log/clamav/freshclam.log
freshclam_pidfile=${localstatedir}/run/amavis/freshclam.pid
clamav_rusr=${restricted_kolab_usr}
clamav_usr=kolab
clamav_grp=${restricted_kolab_usr}
emailscan_usr=${restricted_kolab_usr}
emailscan_grp=${restricted_kolab_grp}
emailserver_confdir=${sysconfdir}/postfix
emailserver_socket=${libdir}/postfix/lmtp
emailserver_localstatedir=${localstatedir}/spool/postfix
emailserver_logfile=${localstatedir}/log/mail.log
emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
emailserver_usr=${kolab_usr}
emailserver_musr=kolab
emailserver_grp=${restricted_kolab_grp}
emailserver_mail_usr=kolab
ftpserver_scoreboardfile=${localstatedir}/proftpd/score
ftpserver_logfile=${localstatedir}/log/proftpd.log
ftpserver_confdir=${sysconfdir}/proftpd
ftpserver_pidfile=${sysrundir}/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}
imap_confperm=0640
imap_usr=cyrus
imap_grp=sasl
imap_masterlogfile=${localstatedir}/log/mail.log
imap_misclogfile=${localstatedir}/log/mail.log
imap_statedir=${localstatedir}/lib/cyrus
imap_spool=${localstatedir}/spool/cyrus/mail
imap_sievedir=${localstatedir}/spool/sieve
imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
kolab_statedir=${localstatedir}/kolab
kolab_logdir=${localstatedir}/log/kolab
kolab_pidfile=${sysrundir}/kolab.pid
kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
ldapserver_statedir=${localstatedir}/lib/ldap
ldapserver_dir=${localstatedir}/lib/ldap
ldapserver_replogfile=${localstatedir}/log/ldap-replicalog
ldapserver_argsfile=${sysrundir}/slapd.args
ldapserver_logfile=${localstatedir}/log/syslog
ldapserver_pidfile=${sysrundir}/slapd.pid
ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
ldapserver_schemadir=${sysconfdir}/ldap/schema
ldapserver_confdir=${sysconfdir}/ldap
ldapserver_usr=ldap
ldapserver_grp=ldap
webserver_document_root=/var/www
webserver_cgidir=${webserver_document_root}/cgi-bin
webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
webserver_logdir=${localstatedir}/log/apache2
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=${sysrundir}/apache2/apache2.pid
webserver_mime_magicfile=${sysconfdir}/apache2/magic
webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
webserver_sslscache=${sysrundir}/ssl_scache
webserver_sslmutex=${sysrundir}/ssl_mutex
webserver_web_prefix=/kolab
webserver_musr=kolab
webserver_usr=wwwrun
webserver_grp=www
phplibdir=${datadir}/php
phplibdir2=${datadir}/php
phppeardir=${phplibdir}/PEAR
sasl_confdir=${sysconfdir}/sasl
sasl_logfile=${localstatedir}/log/saslauthd.log
resmgr_logfile=${localstatedir}/log/resmgr.log
resmgr_confdir=${sysconfdir}/resmgr
resmgr_filterdir=${localstatedir}/resmgr/filter
resmgr_usr=kolab
resmgr_grp=kolab-n
fbview_logfile=${localstatedir}/resmgr/fbview.log
freebusy_logfile=${localstatedir}/resmgr/freebusy.log
freebusy_cachedir=${webserver_document_root}${webserver_web_prefix}/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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- common 30 Dec 2005 10:46:27 -0000 1.10
+++ common 1 Jan 2006 21:20:24 -0000 1.11
@@ -22,6 +22,7 @@
-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
+ -e 's,[@]backupdir[@],$(backupdir),g' \
-e 's,[@]clamav_confdir[@],$(clamav_confdir),g' \
-e 's,[@]clamav_datadir[@],$(clamav_datadir),g' \
-e 's,[@]clamav_grp[@],$(clamav_grp),g' \
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolab 30 Dec 2005 10:46:27 -0000 1.14
+++ kolab 1 Jan 2006 21:20:24 -0000 1.15
@@ -161,3 +161,7 @@
graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+
+backupdir=${sysconfdir}/kolab
+
+
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- suse 30 Dec 2005 19:31:15 -0000 1.12
+++ suse 1 Jan 2006 21:20:24 -0000 1.13
@@ -135,3 +135,5 @@
graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
+backupdir=${localstatedir}/adm/backup/kolab
+
More information about the commits
mailing list