richard: server/kolabd/kolabd/dist_conf suse,1.6,1.7

[cvs at intevation.de]

Author: richard

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

Modified Files:
	suse 
Log Message:
Updated some more variables for suse



Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- suse	23 Dec 2005 21:27:42 -0000	1.6
+++ suse	23 Dec 2005 22:13:12 -0000	1.7
@@ -10,15 +10,15 @@
 kolab_rgrp=${restricted_kolab_grp}
 kolab_susr=root
 
-BASHELL=/bin/bash	# checked
-PERL=${bindir}/perl	# checked
+BASHELL=/bin/bash
+PERL=${bindir}/perl
 PHP=${bindir}/php
 
 kolab_rcdir=${sysconfdir}/init.d
-pkgdocdir=${datadir}/doc/packages/kolab		# checked
+pkgdocdir=${datadir}/doc/packages/kolab
 
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
-perllib=${libdir}/perl5/vendor_perl/5.8.7	# checked
+perllib=${libdir}/perl5/vendor_perl/5.8.7
 
 amavisd_confdir=${sysconfdir}/kolab/amavisd
 amavisd_logfile=${localstatedir}/log/amavisd
@@ -29,7 +29,7 @@
 
 fsl_logfile=${localstatedir}/log/fsl
 
-sysrundir=${localstatedir}/run	# checked
+sysrundir=${localstatedir}/run
 
 clamav_confdir=${sysconfdir}/clamav
 clamav_socket=${localstatedir}/clamav/clamd.sock
@@ -53,7 +53,7 @@
 emailserver_imapdir=${localstatedir}/imapd
 emailserver_imapspooldir=${localstatedir}/imapd/spool
 emailserver_sievedir=${localstatedir}/imapd/sieve
-emailserver_sasl_conffile=(libdir}/sasl2/smtpd.conf	# checked
+emailserver_sasl_conffile=(libdir}/sasl2/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=${restricted_kolab_grp}
@@ -70,15 +70,15 @@
 ftpserver_uid=19416
 ftpserver_gid=19416
 
-imap_confdir=${sysconfdir}/imapd
+imap_confdir=${sysconfdir}
 imap_confperm=0640
-imap_usr=kolab
-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_usr=cyrus
+imap_grp=mail
+imap_masterlogfile=${localstatedir}/lib/imap/log/master.log
+imap_misclogfile=${localstatedir}/lib/imap/log/misc.log
+imap_statedir=${localstatedir}/lib/imap
+imap_spool=${localstatedir}/spool/imap
+imap_sievedir=${localstatedir}/lib/sieve
 imap_lmtp=${imap_statedir}/lmtp
 
 kolab_statedir=${localstatedir}/kolab
@@ -86,45 +86,44 @@
 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_statedir=${localstatedir}/lib/ldap
+ldapserver_dir=${localstatedir}/lib/ldap
+ldapserver_replogfile=${localstatedir}/log/replog
+ldapserver_argsfile=${localstatedir}/log/slapd.args
+ldapserver_logfile=${localstatedir}/log/openldap.log
 ldapserver_pidfile=${sysrundir}/slapd.pid
 ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid
 ldapserver_schemadir=${sysconfdir}/openldap/schema
 ldapserver_confdir=${sysconfdir}/openldap
-ldapserver_usr=kolab
-ldapserver_grp=kolab
+ldapserver_usr=ldap
+ldapserver_grp=ldap
 
 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_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=${localstatedir}/apache/run/apache.pid
-webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
-webserver_mime_typesfile=${sysconfdir}/apache/mime.types
+webserver_mime_magicfile=${sysconfdir}/apache2/magic
+webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 webserver_musr=kolab
-webserver_usr=wwwrun	# checked
-webserver_grp=www	# checked
+webserver_usr=wwwrun
+webserver_grp=www
 
-phplibdir=${datadir}/php	# checked
+phplibdir=${datadir}/php
 phplibdir2=${datadir}/php
-phppeardir=${phplibdir}/PEAR	# checked
+phppeardir=${phplibdir}/PEAR
 
 sasl_confdir=${sysconfdir}/sasl
-sasl_logfile=${localstatedir}/sasl/log/saslauthd.log
+sasl_logfile=${localstatedir}/log/saslauthd.log
 
-resmgr_logfile=${localstatedir}/resmgr/resmgr.log
+resmgr_logfile=${localstatedir}/log/resmgr.log
 resmgr_confdir=${sysconfdir}/resmgr
 resmgr_filterdir=${localstatedir}/resmgr/filter
 resmgr_usr=kolab