Add link to Swagger UI in Readme & Redirect root

[sdc.git] / catalog-be / src / main / docker / backend / startup.sh

diff --git a/catalog-be/src/main/docker/backend/startup.sh b/catalog-be/src/main/docker/backend/startup.sh
index 0dc54a8..0f778a3 100644 (file)
--- a/catalog-be/src/main/docker/backend/startup.sh
+++ b/catalog-be/src/main/docker/backend/startup.sh
@@ -1,30 +1,21 @@
 #!/bin/sh
 
-export JAVA_OPTIONS=" -Dconfig.home=${JETTY_BASE}/config \
-       -Dlog.home=${JETTY_BASE}/logs \
-       -Dlogback.configurationFile=${JETTY_BASE}/config/catalog-be/logback.xml \
-       -Dconfiguration.yaml=${JETTY_BASE}/config/catalog-be/configuration.yaml \
-       -Dartifactgenerator.config=${JETTY_BASE}/config/catalog-be/Artifact-Generator.properties \
-          -Donboarding_configuration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml \
-       -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \
-       -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \
-       -Djetty.console-capture.dir=${JETTY_BASE}/logs \
-       ${JAVA_OPTIONS} "
-
-cd /var/lib/jetty/chef-solo
+export JAVA_OPTIONS="$JAVA_OPTIONS -Dconfig.home=$JETTY_BASE/config \
+       -Dcom.datastax.driver.USE_NATIVE_CLOCK=false \
+       -Dlog.home=$JETTY_BASE/logs \
+       -Dlogback.configurationFile=$JETTY_BASE/config/catalog-be/logback.xml \
+       -Dconfiguration.yaml=$JETTY_BASE/config/catalog-be/configuration.yaml \
+       -Dartifactgenerator.config=$JETTY_BASE/config/catalog-be/Artifact-Generator.properties \
+            -Donboarding_configuration.yaml=$JETTY_BASE/config/onboarding-be/onboarding_configuration.yaml \
+       -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \
+       -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0"
+
+cd $JETTY_BASE/chef-solo
 chef-solo -c solo.rb -E ${ENVNAME}
 
-status=$?
-if [ $status -ne 0 ]; then
-    echo "[ERROR] Problem detected while running chef. Aborting !"
-    exit 1
-fi
-
 # Execute Jetty
-cd /var/lib/jetty
+cd $JETTY_HOME
+echo "jetty.httpConfig.sendServerVersion=false" >> $JETTY_HOME/start.d/start.ini
+echo "$JETTY_BASE/etc/rewrite-root-to-swagger-ui.xml" >> $JETTY_HOME/start.d/rewrite.ini
 
 java $JAVA_OPTIONS -jar "$JETTY_HOME/start.jar"
-
-
-
-