X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Finit.d-rh7;fp=contrib%2Finit.d-rh7;h=01b7213b00e49cc6de47b4244219648ba2e8deb5;hb=da039271d2a4388cb4a385118719d16bc25e2c7e;hp=ec20d6855b460f72fa52d3c6a820289515847d45;hpb=8d4ee27a45cc485a8690fe7a00b7c0c7d5ba5353;p=collectd.git

diff --git a/contrib/init.d-rh7 b/contrib/init.d-rh7
index ec20d685..01b7213b 100755
--- a/contrib/init.d-rh7
+++ b/contrib/init.d-rh7
@@ -6,43 +6,17 @@
 RETVAL=0
 ARGS=""
 prog="collectd"
+CONFIG=/etc/collectd.conf
 
 if [ -r /etc/default/$prog ]; then
 	. /etc/default/$prog
 fi
 
-if [ -n "$DATA_DIR" ]; then
-	ARGS="-D $DATA_DIR"
-fi
-
-if [ -n "$PING_HOST" ]; then
-	for HOST in $PING_HOST
-	do
-		ARGS="$ARGS -p $HOST"
-	done
-fi
-
 start () {
-	if [ "x$START_SERVER" = "xyes" ]
-	then
-		echo -n $"Starting $prog (server): "
-		daemon /usr/sbin/collectd -s $ARGS
-		RETVAL=$?
-		echo
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	fi
-	if [ "x$START_CLIENT" = "xyes" ]
-	then
-		echo -n $"Starting $prog (client): "
-		daemon /usr/sbin/collectd -c $ARGS
-		RETVAL=$?
-		echo
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-	fi
-	if [ "x$START_SERVER" != "xyes" -a "x$START_CLIENT" != "xyes" ]
+	echo -n $"Starting $prog: "
+	if [ -r "$CONFIG" ]
 	then
-		echo -n $"Starting $prog: "
-		daemon /usr/sbin/collectd -l $ARGS
+		daemon /usr/sbin/collectd -C "$CONFIG"
 		RETVAL=$?
 		echo
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog