richard: server/kolabd/kolabd/dist_conf common, 1.12, 1.13 kolab, 1.15, 1.16 kolabsrv.in, 1.2, 1.3 suse, 1.15, 1.16

cvs at intevation.de cvs at intevation.de
Fri Jan 6 21:37:45 CET 2006


Author: richard

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

Modified Files:
	common kolab kolabsrv.in suse 
Log Message:
Generalize the the call to the openldap deamon

* kolab_bootstrap.in: replaced openldap in openpkg rc calls with @LDAPD@
* dist_conf/common: added @LDAPD@
* dist_conf/kolab, dist_conf/suse: added definition for LDAPD
* dist_conf/kolabsrv.in: use @LDAPD@ to start the ldap deamon



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- common	4 Jan 2006 22:03:59 -0000	1.12
+++ common	6 Jan 2006 20:37:43 -0000	1.13
@@ -13,6 +13,7 @@
 	-e 's,[@]BASH[@],$(BASHELL),g' \
 	-e 's,[@]CHKCONFIG[@],$(CHKCONFIG),g' \
 	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
+	-e 's,[@]LDAPD[@],$(LDAPD),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kolab	1 Jan 2006 21:20:24 -0000	1.15
+++ kolab	6 Jan 2006 20:37:43 -0000	1.16
@@ -24,6 +24,9 @@
 PHP=${bindir}/php
 KOLABRC=${bindir}/openpkg
 
+# Define the deamons that are executed with openpkg rc
+LDAPD=openldap
+
 kolab_rcdir=${sysconfdir}/rc.d
 pkgdocdir=${datadir}/doc
 

Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabsrv.in	6 Jan 2006 12:24:36 -0000	1.2
+++ kolabsrv.in	6 Jan 2006 20:37:43 -0000	1.3
@@ -2,10 +2,6 @@
 
 # check if everything is correct
 function check() {
-	if [ $SERVICE = "openldap" ]; then
-		SERVICE="ldap"
-	fi	
-
 	if [ -x "$RCDIR/$SERVICE" ]; then
 		case $PARAM in
 			start|START)     PARAM="start" && rcrun;;
@@ -16,7 +12,7 @@
 			*) echo "ERROR: Parameter $PARAM not supported!"
 		esac
 	else
-		echo "ERROR $RCDIR/$SERVICE NOT found - abort"
+		echo "ERROR $RCDIR/$SERVICE NOT found - abort" >&2
 	fi	
 }
 
@@ -42,7 +38,7 @@
 esac
 
 if [[ "$2" == "all" ]]; then
-	SERVICES="ldap saslauthd spamd amavis apache2 clamd cyrus postfix"
+	SERVICES="@LDAPD@ saslauthd spamd amavis apache2 clamd cyrus postfix"
 	# SERVICES="$SERVICES kolab"
 else
 	SERVICES=$2

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- suse	6 Jan 2006 12:24:36 -0000	1.15
+++ suse	6 Jan 2006 20:37:43 -0000	1.16
@@ -15,6 +15,9 @@
 PERL=${bindir}/perl
 PHP=${bindir}/php
 
+# Define the deamons that are launched from /etc/init.d
+LDAPD=ldap
+
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/packages/kolab
 





More information about the commits mailing list