From 4d0847aa3b649e822657ba084d22d358322e927e Mon Sep 17 00:00:00 2001 From: Wim Fabri Date: Fri, 29 Mar 2024 14:02:06 +0100 Subject: [PATCH] DOCKER-448 - healthcheck when using shared secret --- upstream/solr6/local/91-healthcheck.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/upstream/solr6/local/91-healthcheck.sh b/upstream/solr6/local/91-healthcheck.sh index 167b86a..14a8979 100755 --- a/upstream/solr6/local/91-healthcheck.sh +++ b/upstream/solr6/local/91-healthcheck.sh @@ -29,6 +29,8 @@ if [ $ALFRESCO_SSL != none ] && [ $ALFRESCO_SSL != secret ]; then openssl pkcs12 -in "${SOLR_DIR_ROOT}/keystore/browser.p12" -out "${SOLR_DIR_ROOT}/keystore/browser.pem" -nodes -passin pass:alfresco fi echo "status=\$(curl -f -k -L -w %{http_code} -s -E ${SOLR_DIR_ROOT}/keystore/browser.pem -o /dev/null https://localhost:${PORT}/solr/${DEFAULT_CORES_ALFRESCO[0]}/admin/ping)" >>${SOLR_INSTALL_HOME}/healthcheck.sh +elif [ $ALFRESCO_SSL == secret ]; then + echo "status=\$(curl -f -L -w %{http_code} -s -o /dev/null -H \"X-Alfresco-Search-Secret: \${ALFRESCO_SECRET}\" http://localhost:${PORT}/solr/${DEFAULT_CORES_ALFRESCO[0]}/admin/ping)" >>${SOLR_INSTALL_HOME}/healthcheck.sh else echo "status=\$(curl -f -L -w %{http_code} -s -o /dev/null http://localhost:${PORT}/solr/${DEFAULT_CORES_ALFRESCO[0]}/admin/ping)" >>${SOLR_INSTALL_HOME}/healthcheck.sh fi