richard: server/kolabd/kolabd/dist_conf kolabsrv.in,1.19,1.20

[cvs at kolab.org]

Author: richard

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

Modified Files:
	kolabsrv.in 
Log Message:
Renamed the argument list to status, and made the output alphanumeric.

The argument list now displays the list of related kolab processes.



Index: kolabsrv.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolabsrv.in	8 Nov 2009 13:55:24 -0000	1.19
+++ kolabsrv.in	21 Nov 2009 09:50:07 -0000	1.20
@@ -69,7 +69,7 @@
 PARAM=$3
 
 # Use the service name as defined in the openpkg environment
-# Kolab installations on native distributions, should adap service names
+# Kolab installations on native distributions, should adapt service names
 # with the function getServiceName
 SERVICES="openldap sasl spamd amavisd apache freshclam imapd postfix"
 SERVICES="$SERVICES clamav kolabd"
@@ -79,6 +79,15 @@
 	# okay
 	;;
 list)
+	# Provide an alphanumerical list of services.
+	for S in $SERVICES; do
+		getServiceName $S
+		echo $SERVICE
+	done | tr " " "\n" | sort | tr "\n" " "
+	echo
+	exit
+	;;
+status)
 	for S in $SERVICES; do
 		getServiceName $S
 		case $S in
@@ -93,13 +102,13 @@
 
 	echo "Groupware services:"
 	echo "-------------------"
-	chkconfig --list $GROUPWARE_SERVICES
+	chkconfig --list $(tr " " "\n" <<< $GROUPWARE_SERVICES | sort)
 	echo "All the above listed groupware services must be active."
 	echo
 
 	echo "Defensive services:"
 	echo "-------------------"
-	chkconfig --list $DEFENSIVE_SERVICES
+	chkconfig --list $(tr " " "\n" <<< $DEFENSIVE_SERVICES | sort)
 
 	if [[ "$ENABLE_VIRUS_SCAN" == "no" ]]; then
 		echo "SPAM detection and virus scanning are disabled."
@@ -116,8 +125,11 @@
 	( [[ -n "$RC" ]] && echo "ERROR: $RC not supported"
 	  echo "Use: $PRGNAME rc [all|$SERVICES] [stop|start|restart|status]"
 	  echo
-	  echo "Display the state of the all kolab related processes:"
+	  echo "Obtain a list of all kolab related processes:"
 	  echo "  $PRGNAME list"
+	  echo
+	  echo "Display the state of the all kolab related processes:"
+	  echo "  $PRGNAME status"
 	) >&2
 
 	exit 1