From 4a686e9fce5997b7c39e5f08b4965e4574391f5c Mon Sep 17 00:00:00 2001
From: Sergey Stepanov <sergystepanov@gmail.com>
Date: Mon, 27 Mar 2023 22:20:14 +0300
Subject: [PATCH] Use single server deploy by default

---
 .github/workflows/cd/cloudretro.io/coordinator.env | 1 +
 .github/workflows/cd/cloudretro.io/script.env      | 6 +++---
 .github/workflows/cd/cloudretro.io/worker.env      | 5 ++---
 .github/workflows/cd/deploy-app.sh                 | 8 ++++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd/cloudretro.io/coordinator.env b/.github/workflows/cd/cloudretro.io/coordinator.env
index bfee32c2..b1196a8d 100644
--- a/.github/workflows/cd/cloudretro.io/coordinator.env
+++ b/.github/workflows/cd/cloudretro.io/coordinator.env
@@ -3,3 +3,4 @@ CLOUD_GAME_COORDINATOR_ANALYTICS_INJECT=true
 CLOUD_GAME_COORDINATOR_SERVER_ADDRESS=
 CLOUD_GAME_COORDINATOR_SERVER_HTTPS=true
 CLOUD_GAME_COORDINATOR_SERVER_TLS_DOMAIN=cloudretro.io
+CLOUD_GAME_COORDINATOR_DEBUG=true
diff --git a/.github/workflows/cd/cloudretro.io/script.env b/.github/workflows/cd/cloudretro.io/script.env
index e38ca5c0..dcd559c5 100644
--- a/.github/workflows/cd/cloudretro.io/script.env
+++ b/.github/workflows/cd/cloudretro.io/script.env
@@ -1,6 +1,6 @@
-COORDINATORS="167.172.70.98 cloudretro.io"
+COORDINATORS="167.172.70.98"
 DOCKER_IMAGE_TAG=dev
-DO_ADDRESS_LIST="cloud-gaming cloud-gaming-eu cloud-gaming-usw"
-SPLIT_HOSTS=1
+#DO_ADDRESS_LIST="cloud-gaming cloud-gaming-eu cloud-gaming-usw"
+#SPLIT_HOSTS=1
 USER=root
 WORKERS=${WORKERS:-5}
diff --git a/.github/workflows/cd/cloudretro.io/worker.env b/.github/workflows/cd/cloudretro.io/worker.env
index 319ecef3..6cad3ee4 100644
--- a/.github/workflows/cd/cloudretro.io/worker.env
+++ b/.github/workflows/cd/cloudretro.io/worker.env
@@ -1,9 +1,8 @@
-#CLOUD_GAME_STORAGE_KEY=https://objectstorage.eu-frankfurt-1.oraclecloud.com/p/VVlJPTNcP28wlnBXtA0ezjD5fTut2T01qz5TVwdNejQc6OR1DF5VYYjKTTP2HIlL/n/frmb1qagq0wf/b/cloud-retro-st-001/o/
-#CLOUD_GAME_STORAGE_PROVIDER=oracle
 CLOUD_GAME_WORKER_NETWORK_COORDINATORADDRESS=cloudretro.io
 CLOUD_GAME_WORKER_NETWORK_PUBLICADDRESS=cloudretro.io
 CLOUD_GAME_WORKER_NETWORK_SECURE=true
 CLOUD_GAME_WORKER_SERVER_ADDRESS=:80
 CLOUD_GAME_WORKER_SERVER_HTTPS=true
-CLOUD_GAME_WORKER_SERVER_TLS_ADDRESS=:443
+CLOUD_GAME_WORKER_SERVER_TLS_ADDRESS=:444
 CLOUD_GAME_WORKER_SERVER_TLS_DOMAIN=cloudretro.io
+CLOUD_GAME_WORKER_DEBUG=true
diff --git a/.github/workflows/cd/deploy-app.sh b/.github/workflows/cd/deploy-app.sh
index c1e19e1c..e8682db9 100755
--- a/.github/workflows/cd/deploy-app.sh
+++ b/.github/workflows/cd/deploy-app.sh
@@ -54,6 +54,10 @@ IP_LIST=${IP_LIST:-}
 # a list of machines mark some addresses to deploy only a coordinator there
 COORDINATORS=${COORDINATORS:-}
 
+if [ -z "$SPLIT_HOSTS" ]; then
+    IP_LIST+=$COORDINATORS
+fi
+
 # Digital Ocean operations
 #DO_TOKEN
 DO_ADDRESS_LIST=${DO_ADDRESS_LIST:-}
@@ -147,6 +151,8 @@ for ip in $IP_LIST; do
     cmd+=" worker"
     deploy_coordinator=0
     deploy_worker=1
+  else
+   cmd+=" worker"
   fi
 
   # override run command
@@ -159,6 +165,8 @@ for ip in $IP_LIST; do
          break
        fi
      done
+  else
+    cmd+=" coordinator"
   fi
 
   # build Docker container env file