From 6677d449c798897273e7b5a8d486817102ed1fe7 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 29 Jan 2018 14:43:57 +0100
Subject: [PATCH] Simplify nodectl

---
 dist/argeo-node/rpm/usr/sbin/nodectl | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/dist/argeo-node/rpm/usr/sbin/nodectl b/dist/argeo-node/rpm/usr/sbin/nodectl
index fb1b5802a..0aba3dc59 100755
--- a/dist/argeo-node/rpm/usr/sbin/nodectl
+++ b/dist/argeo-node/rpm/usr/sbin/nodectl
@@ -13,11 +13,6 @@ EXEC_DIR=/var/lib/$APP
 DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/state
 CONFIG_INI=$CONF_RW/config.ini
-LOG_DIR=/var/log/$APP
-LOG_FILE=$LOG_DIR/$APP.log
-
-RUN_DIR=/var/run/$APP
-PID_FILE=$RUN_DIR/$APP.pid
 
 OSGI_INSTALL_AREA=/usr/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
@@ -32,7 +27,6 @@ RETVAL=0
 start() {
 	mkdir -p $CONF_RW
 	mkdir -p $DATA_DIR
-	chown -R $APP.APP $EXEC_DIR
 
 	# Merge config files
 	echo ## Equinox configuration - Generated by /usr/sbin/nodectl > $CONFIG_INI
@@ -94,21 +88,6 @@ stop() {
 	# remove pid file
 	rm -f $PID_FILE
 	return $RETVAL
-
-# timeout is only available in EL6
-#	timeout 5m sh << EOF
-#while kill -0 $PID &> /dev/null; do sleep 1; done
-#EOF
-#	TIMEOUT_EXIT=$?
-#	if [ $TIMEOUT_EXIT -eq 124 ];then
-#		kill -9 $PID
-#		RETVAL=1
-#		echo Killed $APP with pid $PID
-#	else
-#		echo Stopped $APP with pid $PID
-#	fi
-#	rm -f $PID_FILE
-#	return $RETVAL
 }
 
 status() {
-- 
2.30.2