X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-bc%2Fmisc%2Fdmaapbc;h=97ad2261364297b80ac8892f840466e8c1b40e4b;hb=85e7c7e57c262e38a0b3e0a14e4ebf4b92f00a58;hp=74e870724a87ec33812e95308b83b96408486973;hpb=bd10cc4a582b3d1a2f162aab5a2494953618af93;p=dmaap%2Fbuscontroller.git

diff --git a/dmaap-bc/misc/dmaapbc b/dmaap-bc/misc/dmaapbc
index 74e8707..97ad226 100644
--- a/dmaap-bc/misc/dmaapbc
+++ b/dmaap-bc/misc/dmaapbc
@@ -25,7 +25,8 @@ umask 0022
 TZ=GMT0
 COMPONENT=dmaapbc
 APP_ROOT=/opt/app/$COMPONENT
-USER=root
+USER=dbc
+GROUP=onap
 export TZ
 PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jdk/jdk180/bin
 export PATH
@@ -36,7 +37,22 @@ CONFIGMAP_PROPS=${CONFIGMAP_PROPS:-$CONFIGMAP_ROOT/conf/dmaapbc.properties}
 CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/buscontroller.env
 MAIN=org.onap.dmaap.dbcapi.server.Main 
 
-
+authcheck() {
+	set -x
+	ID=`id -n -u`
+	GRP=`id -n -g`
+	if [ "$ID" != "$USER" ]
+	then
+		echo $COMPONENT must be started as user $USER not $ID
+		exit 1
+	fi
+	if [ "$GRP" != "$GROUP" ]
+	then
+		echo $COMPONENT must be started as group $GROUP not $GRP
+		exit 1
+	fi
+	set +x
+}
 
 pids() {
 	set -x
@@ -92,18 +108,7 @@ config() {
 start() {
 	echo "ENTER start"
 	set -x
-	ID=`id -n -u`
-	GRP=`id -n -g`
-	if [ "$ID" != "$USER" ]
-	then
-		echo $COMPONENT must be started as user $USER not $ID
-		exit 1
-	fi
-	if [ "$GRP" != "$USER" ]
-	then
-		echo $COMPONENT must be started as group $USER not $GRP
-		exit 1
-	fi
+	authcheck
 	cd $APP_ROOT
 	pwd
 
@@ -134,18 +139,7 @@ start() {
 
 stop() {
 	echo "ENTER stop"
-	ID=`id -n -u`
-	GRP=`id -n -g`
-	if [ "$ID" != "$USER" ]
-	then
-		echo $COMPONENT must be stopped as user $USER not $ID
-		exit 1
-	fi
-	if [ "$GRP" != "$USER" ]
-	then
-		echo $COMPONENT must be stopped as group $USER not $GRP
-		exit 1
-	fi
+	authcheck
 	touch $APP_ROOT/etc/SHUTDOWN
 	PIDS=`pids`
 	if [ "$PIDS" != "" ]