From 933ac7b2f8b665d876612e0b07ec5a00d12d1dc0 Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Wed, 25 Nov 2020 00:12:59 +0100
Subject: [PATCH] openvidu-deployment: Revert and stop elasticsearch and kibana
 in CF userData if properties ElasticsearchUrl and KibanaUrl are defined

---
 .../aws/cfn-openvidu-server-pro-no-market.yaml.template  | 9 +++++++--
 .../pro/docker-compose/openvidu-server-pro/openvidu      | 7 ++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
index 5c5379cb..a0135059 100644
--- a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
+++ b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template
@@ -656,8 +656,13 @@ Resources:
 
             # Start openvidu application
             pushd /opt/openvidu
-            export FOLLOW_OPENVIDU_LOGS=false
-            /bin/bash openvidu start
+            docker-compose up -d
+            if [[ ! -z ${ElasticsearchUrl} ]]; then
+              docker-compose stop elasticsearch
+            fi
+            if [[ ! -z ${KibanaUrl} ]]; then
+              docker-compose stop kibana
+            fi
             popd
 
             # Wait for the app
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 49f619e0..be106f4f 100755
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
@@ -227,15 +227,12 @@ usage() {
     printf "\n"
 }
 
-# Follow openvidu logs by default
-[ -z "${FOLLOW_OPENVIDU_LOGS}" ] && export FOLLOW_OPENVIDU_LOGS=true
-
 case $1 in
 
   start)
     docker-compose up -d
     stop_elk_if_external
-    [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]] && docker-compose logs -f openvidu-server
+    docker-compose logs -f openvidu-server
     ;;
 
   stop)
@@ -246,7 +243,7 @@ case $1 in
     docker-compose down
     docker-compose up -d
     stop_elk_if_external
-    [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]] && docker-compose logs -f openvidu-server
+    docker-compose logs -f openvidu-server
     ;;
 
   logs)