diff options
| author |   Eylon Malin <eylon.malin@intl.att.com> | 2019-12-15 10:22:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-15 10:22:38 +0000 |
| commit | fb6107831c6cdb2af0fee45e3e60a6c978ea8f61 (patch) | |
| tree | a1b6f9b0a36a3f157352783dbcde58a87b885f37 /deliveries/src/main/scripts/localize.sh | |
| parent | 1a6e6bfbf92bc704d4c4e7b2e3593183fd4d2862 (diff) | |
| parent | 479b73d878468eb980bc436368263b42344147be (diff) | |
Merge "Let straightforward `vidkeystorepassword` setting in values.yaml"
Diffstat (limited to 'deliveries/src/main/scripts/localize.sh')
| -rwxr-xr-x | deliveries/src/main/scripts/localize.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/deliveries/src/main/scripts/localize.sh b/deliveries/src/main/scripts/localize.sh index aca557f36..918027913 100755 --- a/deliveries/src/main/scripts/localize.sh +++ b/deliveries/src/main/scripts/localize.sh @@ -20,4 +20,10 @@ TEMPLATES_BASE_DIR=/usr/local/tomcat/webapps/vid/WEB-INF fillTemplateProperties ${TEMPLATES_BASE_DIR} +# Set CATALINA_OPTS if not defined previously +# Enables late-evaluation of env variables, such as VID_KEYSTORE_PASSWORD +: "${CATALINA_OPTS:=-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME} -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp}" +echo "CATALINA_OPTS: ${CATALINA_OPTS}" +export CATALINA_OPTS + catalina.sh run |