mathieu: server/kolabd/kolabd/dist_conf debian, 1.25, 1.25.2.1 kolabsrv.in, 1.16, 1.16.2.1

[cvs at kolab.org]

Author: mathieu

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

Modified Files:
      Tag: kolab_2_2_branch
	debian kolabsrv.in 
Log Message:
backport fixes from HEAD:
2009-03-17  Mathieu Parent <math.parent at gmail.com>

	* dist_conf/debian: sync with dist_conf/kolab (resmgr_locksdir,
	resmgr_localedir and LDAPD)
	* dist_conf/kolabsrv.in: add debian flavour




Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- debian	10 Feb 2009 22:41:14 -0000	1.25
+++ debian	27 Mar 2009 15:28:31 -0000	1.25.2.1
@@ -17,6 +17,9 @@
 restricted_kolab_usr=kolab
 restricted_kolab_grp=kolab
 
+# Define the deamons that are executed with openpkg rc
+LDAPD=slapd
+
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/kolab
 kolabconf_script=${sbindir}/kolabconf
@@ -148,12 +151,13 @@
 resmgr_conffile_usr=kolab
 resmgr_conffile_grp=root
 #resmgr_tmpdir=
+resmgr_locksdir=${kolab_statedir}/filter/locks
+resmgr_localedir=${libdir}/usr/share/php/data/Kolab_Filter/locale
 resmgr_scriptsdir=${bindir}
 resmgr_usr=root
 resmgr_grp=www-data
-resmgr_filterdir=${kolab_statedir}/resmgr/filter
 resmgr_log_type=syslog
-resmgr_log_name=cons, pid
+resmgr_log_name='cons,pid'
 
 fbview_logfile=${localstatedir}/log/fbview.log
 freebusy_logdir=${localstatedir}/log
@@ -162,7 +166,7 @@
 freebusy_usr=root
 freebusy_grp=www-data
 freebusy_log_type=syslog
-freebusy_log_name=cons, pid
+freebusy_log_name='cons,pid'
 
 graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard_tscache.db

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- kolabsrv.in	25 Feb 2009 22:40:51 -0000	1.16
+++ kolabsrv.in	27 Mar 2009 15:28:31 -0000	1.16.2.1
@@ -43,6 +43,17 @@
 			clamav) SERVICE="clamd" ;;
 			*) SERVICE=$sname
 		esac
+	elif [ -e /etc/debian_version ]; then
+		case $sname in
+			openldap) SERVICE="@LDAPD@" ;;
+			sasl) SERVICE="saslauthd" ;;
+			imapd) SERVICE="kolab-cyrus" ;;
+			amavisd) SERVICE="amavis" ;;
+			clamav) SERVICE="clamav-daemon" ;;
+			spamd) SERVICE="spamassassin" ;;
+			freshclam) SERVICE="clamav-freshclam" ;;
+			*) SERVICE=$sname
+		esac
 	fi
 }	
 
@@ -54,7 +65,7 @@
 # Use the service name as defined in the openpkg environment
 # Kolab installations on native distributions, should adap service names
 # with the function getServiceName
-SERVICES="@LDAPD@ saslauthd spamd amavisd apache2 freshclam cyrus postfix"
+SERVICES="@LDAPD@ saslauthd spamd amavisd apache2 freshclam imapd postfix"
 SERVICES="$SERVICES clamav kolabd"
 
 case $RC in