summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-12-24 07:15:31 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-24 07:15:31 +0000
commit8fd9bd94ca80daf31a8fc83893503120d9405a2f (patch)
tree57097af4cdfcc6d194eed22f9424645b8a39dbd1
parentb909d1e85f13431436808e6880a1e857addb449c (diff)
parent9dff984184ad33fb12d006ee564d4269ae07248e (diff)
Merge "Make logback.xml editable after VID is deployed"
-rwxr-xr-xdeliveries/src/main/scripts/localize.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/deliveries/src/main/scripts/localize.sh b/deliveries/src/main/scripts/localize.sh
index 918027913..d149e3bae 100755
--- a/deliveries/src/main/scripts/localize.sh
+++ b/deliveries/src/main/scripts/localize.sh
@@ -7,6 +7,12 @@ fillTemplateProperties() {
}
}
+createWritableLogbackConfig() {
+ # Create logback.xml in /tmp/vid/
+ # /tmp/logback.xml is owned by root and unmodifiable
+ cp -f /tmp/logback.xml /tmp/vid/logback.xml
+}
+
deployWarOnTomcatManually() {
cd /usr/local/tomcat/webapps/
mkdir vid
@@ -14,6 +20,8 @@ deployWarOnTomcatManually() {
jar -xf /tmp/vid/stage/vid.war
}
+
+createWritableLogbackConfig
deployWarOnTomcatManually
TEMPLATES_BASE_DIR=/usr/local/tomcat/webapps/vid/WEB-INF
@@ -22,7 +30,7 @@ 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}"
+: "${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/vid/}"
echo "CATALINA_OPTS: ${CATALINA_OPTS}"
export CATALINA_OPTS