gunnar: server/kolabd/kolabd/dist_conf gentoo,1.6,1.7

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	gentoo 
Log Message:
	* dist_conf/gentoo: 

	Updated to the newest configuration settings for Gentoo.


Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gentoo	14 Nov 2006 21:34:22 -0000	1.6
+++ gentoo	14 Dec 2006 14:39:02 -0000	1.7
@@ -50,7 +50,7 @@
 
 ### -> users
 
-clamav_rusr=clamav
+clamav_rusr=${amavisd_rusr}
 clamav_usr=root
 clamav_grp=root
 
@@ -59,11 +59,11 @@
 clamav_confdir=${sysconfdir}
 clamav_statedir=${statelibdir}/clamav
 clamav_datadir=${clamav_statedir}
-clamav_socket=${clamav_statedir}/clamd.sock
-clamav_logfile=${clamav_statedir}/clamd.log
-clamav_pidfile=${clamav_statedir}/clamd.pid
-freshclam_logfile=${clamav_statedir}/freshclam.log
-freshclam_pidfile=${clamav_statedir}/freshclam.pid
+clamav_socket=${amavisd_home}/clamd.sock
+clamav_logfile=${logdir}/clamav/clamd.log
+clamav_pidfile=${amavisd_home}/clamd.pid
+freshclam_logfile=${logdir}/clamav/freshclam.log
+freshclam_pidfile=${sysrundir}/clamav/freshclam.pid
 
 #--------------------------------------------------------------------
 
@@ -103,7 +103,7 @@
 
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_confdir=${sysconfdir}/postfix
-emailserver_socket=${localstatedir}/kolab/lmtp
+emailserver_socket=${imap_statedir}/socket/lmtp
 emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
 aliases_file=${sysconfdir}/mail/aliases
 
@@ -144,7 +144,7 @@
 imap_misclogfile=${imap_statedir}/log/misc.log
 imap_spool=${localstatedir}/spool/imap
 imap_sievedir=${imap_statedir}/sieve
-imap_lmtp=${imap_statedir}/lmtp
+imap_notify_socket=${imap_statedir}/socket/notify
 
 #####################################################################
 # Proftpd parameters
@@ -219,7 +219,7 @@
 webserver_runtime_status=${webserver_logdir}/apache_runtime_status
 webserver_sessions=${localstatedir}/cache/httpd_sessions
 
-webserver_document_root=${wwwdir}/kolab
+webserver_document_root=${wwwdir}/kolab/htdocs
 webserver_cgidir=${webserver_document_root}/cgi-bin
 webserver_pidfile=${localstatedir}/apache/run/apache.pid
 webserver_mime_magicfile=${sysconfdir}/apache/mime.magic
@@ -235,7 +235,7 @@
 phpini_dir=${sysconfdir}/php/apache2-php5/
 phplibdir=${datadir}/php
 phplibdir2=${datadir}/php
-phppeardir=${phplibdir}/horde
+phppeardir=${phplibdir}
 kolab_php_module_prefix=kolab/
 kolab_php_smarty_prefix=smarty/
 
@@ -271,6 +271,7 @@
 	    ${emailserver_confdir}/master.cf \
 	    ${emailserver_confdir}/transport \
 	    ${emailserver_confdir}/virtual   \
+	    ${aliases_file}                  \
             ${sysconfdir}/conf.d/apache2     \
             ${sysconfdir}/conf.d/saslauthd
 	    
@@ -281,8 +282,10 @@
 
 ### -> users
 
-resmgr_usr=kolab
-resmgr_grp=kolab-n
+resmgr_usr=root
+resmgr_grp=root
+freebusy_usr=root
+freebusy_grp=apache
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}