richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.21,1.22

[cvs at kolab.org]

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
- re-arrange the execution order of the services
- make it possible to skip the services freshclam and clamd used on
  Debian



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolabsrv.in	23 Nov 2009 21:55:21 -0000	1.21
+++ kolabsrv.in	23 Nov 2009 22:47:08 -0000	1.22
@@ -83,6 +83,12 @@
 	system=other
 fi
 
+# Some distributions run / control the services clamav and freshclam from
+# amavisd.  The services can be unset in @sysconfdir@/kolab/profile.sh,
+# when unset, they are not called obviously. 
+CLAMAV=clamav
+FRESHCLAM=freshclam
+
 [[ -f /etc/kolab/profile.sh ]] && . /etc/kolab/profile.sh
 
 # variables
@@ -94,12 +100,23 @@
 # Kolab installations on native distributions, should adapt service names
 # with the function getServiceName
 #
+# The order in which the services get started in openSUSE is as follows:
+# S08ldap
+# S08saslauthd
+# S08clamd
+# S10amavis
+# S10cyrus
+# S11postfix
+# S12apache2
+# S13kolabd
+# S13freshclam
+# 
 # In earlier days, spamd was part of the services as well.  But as
 # spamassassin is used as library for amavisd, it is not needed to run it
 # as a seperate service.  More information about this topic can be found
 # at https://issues.kolab.org/issue3953
-SERVICES="openldap sasl amavisd apache freshclam imapd postfix"
-SERVICES="$SERVICES clamav kolabd"
+SERVICES="openldap sasl $CLAMAV amavisd imapd postfix apache"
+SERVICES="$SERVICES kolabd $FRESHCLAM"
 
 case $RC in 
 rc)