X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fbin%2Fstart.sh;h=b9c49c234f1029233facee9e57c8e59f1025dd3c;hb=1a7e8802abcaa97632c46e8544d7264ce1414d06;hp=0e11779bee92c3b4ff215bb901c0ea9cf43e9636;hpb=7faa186d6cbd20f2dfd44b282a4801b0e4546b74;p=aai%2Fdata-router.git

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 0e11779..b9c49c2 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-BASEDIR="/opt/app/data-router/"
-AJSC_HOME="$BASEDIR"
-AJSC_CONF_HOME="$AJSC_HOME/bundleconfig/"
+MICRO_HOME="/opt/app/data-router"
+
+
 
 if [ -z "$CONFIG_HOME" ]; then
         echo "CONFIG_HOME must be set in order to start up process"
@@ -10,71 +10,51 @@ if [ -z "$CONFIG_HOME" ]; then
 fi
 
 if [ -z "$KEY_STORE_PASSWORD" ]; then
-        echo "KEY_STORE_PASSWORD must be set in order to start up process"
-        exit 1
-else
-        echo "KEY_STORE_PASSWORD=$KEY_STORE_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
+	echo "KEY_STORE_PASSWORD must be set in order to start up process"
+	exit 1
 fi
 
-if [ -z "$KEY_MANAGER_PASSWORD" ]; then
-        echo "KEY_MANAGER_PASSWORD must be set in order to start up process"
-        exit 1
-else
-        echo "KEY_MANAGER_PASSWORD=$KEY_MANAGER_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
-fi
+# Changes related to:AAI-2176
+# Change aai datarouter  container processes to run as non-root on the host
+USER_ID=${LOCAL_USER_ID:-9001}
+GROUP_ID=${LOCAL_GROUP_ID:-9001}
+DR_LOGS=/var/log/onap/AAI-DR
+
+if [ $(cat /etc/passwd | grep aaiadmin | wc -l) -eq 0 ]; then
+
+        groupadd aaiadmin -g ${GROUP_ID} || {
+                echo "Unable to create the group id for ${GROUP_ID}";
+                exit 1;
+        }
+        useradd --shell=/bin/bash -u ${USER_ID} -g ${GROUP_ID} -o -c "" -m aaiadmin || {
+                echo "Unable to create the user id for ${USER_ID}";
+                exit 1;
+        }
+fi;
+chown -R aaiadmin:aaiadmin ${MICRO_HOME}
+chown -R aaiadmin:aaiadmin ${DR_LOGS}
+find ${MICRO_HOME}  -name "*.sh" -exec chmod +x {} +
+
+gosu aaiadmin ln -s /logs $MICRO_HOME/logs
+JAVA_CMD="exec gosu aaiadmin java";
+###
+PROPS="-DAJSC_HOME=${MICRO_HOME}"
+PROPS="$PROPS -Dlogging.config=${MICRO_HOME}/bundleconfig/etc/logback.xml"
+PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
+PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD"
 
-# Add any routes configured at deploy time to the data layer service
-if [ -n "$DYNAMIC_ROUTES" ]; then
-        echo "Adding the following dynamic routes to the deployment: "
-        mkdir -p /tmp/data-router/v1/routes
-        for f in `ls $DYNAMIC_ROUTES`
-        do
-                cp $DYNAMIC_ROUTES/$f /tmp/data-router/v1/routes
-                echo "Adding dynamic route $DYNAMIC_ROUTES/$f"
-        done
-        jar uf /opt/app/data-router/services/data-router_v1.zip* -C /tmp/ data-router
-        rm -rf /tmp/data-router
+if [ ! -z "$TRUST_STORE_PASSWORD" ]; then
+   PROPS="$PROPS -DTRUST_STORE_PASSWORD=${TRUST_STORE_PASSWORD}"
 fi
 
-# Add any spring bean configuration files to the data layer deployment
-if [ -n "$SERVICE_BEANS" ]; then
-        echo "Adding the following dynamic service beans to the deployment: "
-        mkdir -p /tmp/data-router/v1/conf
-        for f in `ls $SERVICE_BEANS`
-        do
-                cp $SERVICE_BEANS/$f /tmp/data-router/v1/conf
-                echo "Adding dynamic service bean $SERVICE_BEANS/$f"
-        done
-        jar uf /opt/app/data-router/services/data-router_v1.zip* -C /tmp/ data-router
-        rm -rf /tmp/data-router
+if [ ! -z "$TRUST_STORE_LOCATION" ]; then
+   PROPS="$PROPS -DTRUST_STORE_LOCATION=${TRUST_STORE_LOCATION}"
 fi
 
-# Add any dynamic component configuration files to the data layer deployment
-if [ -n "$COMPLIB" ]; then
-        echo "Adding the following dynamic libraries to the deployment: "
-        mkdir -p /tmp/data-router/v1/lib
-        for f in `ls $COMPLIB`
-        do
-                cp $COMPLIB/$f /tmp/data-router/v1/lib
-                echo "Adding dynamic library $COMPLIB/$f"
-        done
-        jar uf /opt/app/data-router/services/data-router_v1.zip* -C /tmp/ data-router
-        rm -rf /tmp/data-router
-fi
 
-CLASSPATH="$AJSC_HOME/lib/*"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/extJars/"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/etc/"
-PROPS="-DAJSC_HOME=$AJSC_HOME"
-PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME"
-PROPS="$PROPS -Dlogback.configurationFile=$BASEDIR/bundleconfig/etc/logback.xml"
-PROPS="$PROPS -DAJSC_SHARED_CONFIG=$AJSC_CONF_HOME"
-PROPS="$PROPS -DAJSC_SERVICE_NAMESPACE=data-router"
-PROPS="$PROPS -DAJSC_SERVICE_VERSION=v1"
-PROPS="$PROPS -Dserver.port=9502"
-PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
 
-echo $CLASSPATH
+cd ${MICRO_HOME}
+jar uf0 ${MICRO_HOME}/data-router.jar BOOT-INF/lib/* > /dev/null 2>&1
 
-exec java -Xmx${JVM_MAX_HEAP}m $PROPS -classpath $CLASSPATH com.att.ajsc.runner.Runner context=// sslport=9502
+${JAVA_CMD}  -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${MICRO_HOME}/data-router.jar