X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fdocker%2Fsrc%2Fmain%2Fdocker%2Fdocker-install.sh;h=a4dd0ceb1960bbefc91eee68ccaa6ea562403c12;hb=daee922e51e60c3cad6a3cc691214a34aad9ac7f;hp=e8b9aaf1451979aca92b167a4d69fbabc1f81125;hpb=1336873e38435dd1b8d7e88cda9b8012dd83f575;p=policy%2Fengine.git diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh index e8b9aaf14..a4dd0ceb1 100644 --- a/packages/docker/src/main/docker/docker-install.sh +++ b/packages/docker/src/main/docker/docker-install.sh @@ -1,4 +1,24 @@ #!/bin/bash +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + ######################################################################### ## @@ -151,6 +171,7 @@ function configure_component() { SED_LINE+=" -e 's!\${{KEYSTORE_PASSWD}}!${KEYSTORE_PASSWD}!g' " SED_LINE+=" -e 's!\${{JAVA_HOME}}!${JAVA_HOME}!g' " SED_LINE+=" -e 's!\${{COMPONENT_TYPE}}!${COMPONENT_TYPE}!g' " + SED_LINE+=" -e 's!\${{POLICY_LOGS}}!${POLICY_LOGS}!g' " while read line || [ -n "${line}" ]; do if [[ -n $line ]] && [[ $line != \#* ]]; then @@ -577,7 +598,7 @@ DEBUG=n BASE_CONF=base.conf -TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.23 +TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.50 INSTALL_DIR="$(pwd)" @@ -658,6 +679,11 @@ if [[ -z ${POLICY_GROUP} ]]; then exit 1 fi +if [[ -z ${POLICY_LOGS} ]]; then + echo "POLICY_LOGS environment variable NOT set, default to /var/log/onap" + export POLICY_LOGS="/var/log/onap" +fi + FQDN=$(hostname -f 2> /dev/null) if [[ $? != 0 || -z ${FQDN} ]]; then echo "error: cannot determine the FQDN for this host $(hostname)."