richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.17,1.18

[cvs at kolab.org]

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
Change @LDAPD@ to just openldap, kolab/issue3604

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolabsrv.in	17 Mar 2009 22:16:48 -0000	1.17
+++ kolabsrv.in	3 May 2009 19:40:14 -0000	1.18
@@ -36,6 +36,7 @@
 	# lsb_release -i | cut -f2
 	if [ -e /etc/SuSE-release ]; then
 		case $sname in
+			apache) SERVICE="apache2" ;;
 			openldap) SERVICE="@LDAPD@" ;;
 			sasl) SERVICE="saslauthd" ;;
 			imapd) SERVICE="cyrus" ;;
@@ -45,6 +46,7 @@
 		esac
 	elif [ -e /etc/debian_version ]; then
 		case $sname in
+			apache) SERVICE="apache2" ;;
 			openldap) SERVICE="@LDAPD@" ;;
 			sasl) SERVICE="saslauthd" ;;
 			imapd) SERVICE="kolab-cyrus" ;;
@@ -65,7 +67,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 imapd postfix"
+SERVICES="openldap sasl spamd amavisd apache freshclam imapd postfix"
 SERVICES="$SERVICES clamav kolabd"
 
 case $RC in