Integrate AAF certificate and CA truststore

[dmaap/buscontroller.git] / misc / dmaapbc

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 19bb3f7..5254108 100644 (file)
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -14,10 +14,11 @@ CONTAINER_CONFIG=/opt/app/config/conf
 MAIN=org.onap.dmaap.dbcapi.server.Main 
 
 
+
 pids() {
-       #set -x
+       set -x
        ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//'
-       #set +x
+       set +x
 }
 
 config() {
@@ -34,13 +35,23 @@ config() {
        fi
        cd $APP_ROOT
        source $CONTAINER_CONFIG
-       # comment out till certs are available
-       #if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
-       #then
-       #       echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
-       #       exit 1
-       #fi
-       #$APP_ROOT/misc/cert-client-init.sh
+
+       if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ]
+       then
+               echo "Creating $APP_ROOT/ok_to_exit so no waiting..."
+               > $APP_ROOT/ok_to_exit
+       else
+               echo "Not creating $APP_ROOT/ok_to_exit"
+       fi      
+       
+       if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
+       then
+               echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
+               exit 1
+       fi
+       $APP_ROOT/misc/cert-client-init.sh
+       . misc/havecert.tmpl > etc/havecert
+       chmod +x etc/havecert
        . misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties
     . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
        set +x
@@ -62,14 +73,13 @@ start() {
        fi
        cd $APP_ROOT
 
-# disable until we use certs
-#      if etc/havecert
-#      then
+       if etc/havecert
+       then
                echo >/dev/null
-#      else
-#              echo No certificate file available.  Cannot start
-#              exit 0
-#      fi
+       else
+               echo No certificate file available.  Cannot start
+               exit 0
+       fi
        PIDS=`pids`
        if [ "$PIDS" != "" ]
        then
@@ -80,23 +90,11 @@ start() {
 
        # JVM flags
 #old line from Dockerfile...keep for reference only
-       FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties  -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
-       nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
+       FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties  -Dlogback.configurationFile=etc/logback.xml -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+       #nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
+       nohup java $FLAGS $MAIN </dev/null  &
        sleep 5
        PIDS=`pids`
-       if [ "$PIDS" = "" ]
-       then
-               echo $COMPONENT startup failed
-               ls -l $APP_ROOT/logs/EELF
-               echo "------------ error.log ---------------"
-               cat $APP_ROOT/logs/EELF/error.log
-               echo "------------ server.log ---------------"
-               cat $APP_ROOT/logs/EELF/server.log
-               echo "------------ tail -100 application.log ---------------"
-               tail -100 $APP_ROOT/logs/EELF/application.log
-       else
-               echo $COMPONENT started
-       fi
        set +x
 }
 
@@ -162,4 +160,18 @@ case "$1" in
        exit 1
        ;;
 esac
+               ls -l $APP_ROOT/logs/EELF
+               echo "------------ tail -100 error.log ---------------"
+               tail -100  $APP_ROOT/logs/EELF/error.log
+               echo "------------ tail -100 server.log ---------------"
+               tail -100  $APP_ROOT/logs/EELF/server.log
+               echo "------------ tail -100 application.log ---------------"
+               tail -100 $APP_ROOT/logs/EELF/application.log
+
+               echo "Check $APP_ROOT/ok_to_exit"
+               while [ ! -f $APP_ROOT/ok_to_exit ]
+               do
+                       echo "$APP_ROOT/ok_to_exit does not exist.  Sticking around for debugging..."
+                       sleep 10
+               done
 exit 0