diff options
author | 2018-06-12 10:15:26 -0400 | |
---|---|---|
committer | 2018-06-12 10:17:12 -0400 | |
commit | 34aa4984446aeb39b64930baf64058ea22ec9da0 (patch) | |
tree | 9c84f5ba375f010bb8dc61592c7be0e8049e2179 /src/main/bin | |
parent | 9fcd2fde2324077ba019cbf845caec4378599613 (diff) |
fix ping communication with search to datarouter
Add the fix needed in order for the search ping to communicate with data
router as well as add some fixes to the start script and dockerfile
Issue-ID: AAI-1224
Change-Id: I74ab3b8def4b85513401b7329d33dc6a3bc518bc
Signed-off-by: renealr <reneal.rogers@amdocs.com>
Diffstat (limited to 'src/main/bin')
-rw-r--r-- | src/main/bin/start.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 3d6036f..69550c6 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -12,28 +12,14 @@ fi if [ -z "$KEY_STORE_PASSWORD" ]; then echo "KEY_STORE_PASSWORD must be set in order to start up process" exit 1 -else - ## Extract java jar to DEOBFUSCATE the password. - CURR_D=`pwd` - cd $BASEDIR - jar xf search-data-service-package.jar - sudo java -cp ./BOOT-INF/lib/jetty-util-9.4.8.v20171121.jar org.eclipse.jetty.util.security.Password $KEY_STORE_PASSWORD > pass.txt 2>> pass.txt - PASS=`sed "2q;d" pass.txt` - sudo rm pass.txt - cd $CURR_D fi -## tomcat_keystore to p12 -keytool -importkeystore -noprompt -deststorepass $PASS -destkeypass $PASS -srckeystore $BASEDIR/config/auth/tomcat_keystore -destkeystore $BASEDIR/config/auth/onap.p12 -deststoretype PKCS12 -srcstorepass $PASS - -## import into cacerts -sudo keytool -importkeystore -noprompt -deststorepass changeit -destkeypass changeit -destkeystore /$JAVA_HOME/jre/lib/security/cacerts -srckeystore $BASEDIR/config/auth/onap.p12 -srcstoretype PKCS12 -srcstorepass $PASS -alias tomcat - PROPS="-DAJSC_HOME=$AJSC_HOME" PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME" PROPS="$PROPS -Dlogging.config=$BASEDIR/bundleconfig/etc/logback.xml" PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME" PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD" + JVM_MAX_HEAP=${MAX_HEAP:-1024} java $PROPS -jar $BASEDIR/search-data-service-package.jar
\ No newline at end of file |