From ef20bf58e59aefa38391416f3ec3356152c8cceb Mon Sep 17 00:00:00 2001 From: cruizba Date: Thu, 26 Nov 2020 12:07:07 +0100 Subject: [PATCH] openvidu-deployment: Don't run elasticsearch and kibana if external url is configured --- .../openvidu-server-pro/openvidu | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu index be106f4f..e4637a10 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu @@ -195,21 +195,28 @@ is_external_url() { fi } -stop_elk_if_external() { +start_openvidu() { + local RUN_LOCAL_ES + local RUN_LOCAL_KIBANA local CONFIGURED_ELASTICSEARCH_HOST local CONFIGURED_KIBANA_HOST CONFIGURED_ELASTICSEARCH_HOST=$(grep -v '^#' .env | grep OPENVIDU_PRO_ELASTICSEARCH_HOST | cut -d '=' -f2) CONFIGURED_KIBANA_HOST=$(grep -v '^#' .env | grep OPENVIDU_PRO_KIBANA_HOST | cut -d '=' -f2) + RUN_LOCAL_ES=true + RUN_LOCAL_KIBANA=true if is_external_url "${CONFIGURED_ELASTICSEARCH_HOST}"; then printf "Configured external elasticsearch: %s" "${CONFIGURED_ELASTICSEARCH_HOST}" printf "\n" - docker-compose stop elasticsearch + RUN_LOCAL_ES=false fi if is_external_url "${CONFIGURED_KIBANA_HOST}"; then printf "Configured external kibana: %s" "${CONFIGURED_KIBANA_HOST}" printf "\n" - docker-compose stop kibana + RUN_LOCAL_KIBANA=false fi + docker-compose up -d \ + $(if [ "${RUN_LOCAL_ES}" == "false" ]; then echo '--scale elasticsearch=0'; fi) \ + $(if [ "${RUN_LOCAL_KIBANA}" == "false" ]; then echo '--scale kibana=0'; fi) } usage() { @@ -230,8 +237,7 @@ usage() { case $1 in start) - docker-compose up -d - stop_elk_if_external + start_openvidu docker-compose logs -f openvidu-server ;; @@ -241,8 +247,7 @@ case $1 in restart) docker-compose down - docker-compose up -d - stop_elk_if_external + start_openvidu docker-compose logs -f openvidu-server ;;