diff options
Diffstat (limited to 'packages/docker/src')
| -rw-r--r-- | packages/docker/src/main/docker/do-start.sh | 7 | ||||
| -rw-r--r-- | packages/docker/src/main/docker/docker-install.sh | 17 |
2 files changed, 20 insertions, 4 deletions
diff --git a/packages/docker/src/main/docker/do-start.sh b/packages/docker/src/main/docker/do-start.sh index 47b835ac9..0179fad70 100644 --- a/packages/docker/src/main/docker/do-start.sh +++ b/packages/docker/src/main/docker/do-start.sh @@ -64,9 +64,10 @@ else . /opt/app/policy/etc/profile.d/env.sh - # install policy keystore - mkdir -p $POLICY_HOME/etc/ssl - cp config/policy-keystore $POLICY_HOME/etc/ssl + if [[ -f config/policy-keystore ]]; then + # install policy keystore + cp config/policy-keystore $POLICY_HOME/etc/ssl + fi if [[ -f config/$container-tweaks.sh ]] ; then # file may not be executable; running it as an diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh index a4dd0ceb1..62289c591 100644 --- a/packages/docker/src/main/docker/docker-install.sh +++ b/packages/docker/src/main/docker/docker-install.sh @@ -356,7 +356,6 @@ function install_base() { exit 1 fi - /bin/mkdir -p ${POLICY_HOME}/etc/ssl > /dev/null 2>&1 /bin/mkdir -p ${POLICY_HOME}/etc/init.d > /dev/null 2>&1 /bin/mkdir -p ${POLICY_HOME}/tmp > /dev/null 2>&1 /bin/mkdir -p ${POLICY_HOME}/var > /dev/null 2>&1 @@ -394,6 +393,21 @@ function configure_base() { fi } +function configure_keystore() { + if [[ $DEBUG == y ]]; then + echo "-- ${FUNCNAME[0]} --" + set -x + fi + + local DEFAULT_KEYSTORE_PASSWORD="Pol1cy_0nap" + + if [[ -n ${KEYSTORE_PASSWD} ]]; then + keytool -storepasswd -storepass ${DEFAULT_KEYSTORE_PASSWORD} -keystore ${POLICY_HOME}/etc/ssl/policy-keystore -new ${KEYSTORE_PASSWD} + keytool -list -keystore ${POLICY_HOME}/etc/ssl/policy-keystore -storepass ${KEYSTORE_PASSWD} + fi +} + + function install_tomcat_component() { if [[ $DEBUG == y ]]; then echo "-- ${FUNCNAME[0]} $@ --" @@ -731,6 +745,7 @@ if [[ ${OPERATION} == configure ]]; then base) configure_base component_preconfigure + configure_keystore ;; pdp) configure_component "${COMPONENT_TYPE}.conf" "${POLICY_HOME}/servers/${COMPONENT_TYPE}/" |