From 148cf87224bddd0e6b6d617e7b17fbdcedcd36aa Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 20 May 2021 12:21:58 +0100
Subject: [PATCH] Cleanup after testing/looking through hosting files.

---
 hosting/bootstrap.sh                | 20 --------------------
 hosting/docker-compose.yaml         |  1 +
 hosting/start.sh                    |  2 --
 hosting/update.sh                   |  1 -
 packages/cli/src/analytics/index.js | 16 ++++++++--------
 5 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100755 hosting/bootstrap.sh
 delete mode 100755 hosting/start.sh
 delete mode 100644 hosting/update.sh

diff --git a/hosting/bootstrap.sh b/hosting/bootstrap.sh
deleted file mode 100755
index 4e15481e64..0000000000
--- a/hosting/bootstrap.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-GITHUB_BASE_URL=https://raw.githubusercontent.com/Budibase/budibase/master/hosting
-
-if ! [ -x "$(command -v wget)" ]; then
-  echo 'Error: wget is not installed. Please install it for your operating system.' >&2
-  exit 1
-fi
-
-fetch_config_files() {
-  wget $GITHUB_BASE_URL/docker-compose.yaml
-  wget $GITHUB_BASE_URL/envoy.yaml
-  wget $GITHUB_BASE_URL/hosting.properties
-  wget $GITHUB_BASE_URL/start.sh
-}
-
-fetch_config_files
-
-# Start budibase
-docker-compose --env-file hosting.properties up -d
diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 00c93ca1c6..73bbcfc39b 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -48,6 +48,7 @@ services:
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
     depends_on:
+      - redis-service
       - minio-service
       - couch-init
 
diff --git a/hosting/start.sh b/hosting/start.sh
deleted file mode 100755
index b32098a3b7..0000000000
--- a/hosting/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker-compose --env-file hosting.properties up
diff --git a/hosting/update.sh b/hosting/update.sh
deleted file mode 100644
index 3ccd5e59d0..0000000000
--- a/hosting/update.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose --env-file hosting.properties pull && ./start.sh
diff --git a/packages/cli/src/analytics/index.js b/packages/cli/src/analytics/index.js
index 3d8ea8c5a7..d85323d1d0 100644
--- a/packages/cli/src/analytics/index.js
+++ b/packages/cli/src/analytics/index.js
@@ -11,13 +11,13 @@ async function optOut() {
     client.disable()
     console.log(
       success(
-        "Successfully opted out of budibase analytics. You can opt in at any time by running 'budi analytics opt-in'"
+        "Successfully opted out of Budibase analytics. You can opt in at any time by running 'budi analytics opt-in'"
       )
     )
   } catch (err) {
     console.log(
       error(
-        "Error opting out of budibase analytics. Please try again later.",
+        "Error opting out of Budibase analytics. Please try again later.",
         err
       )
     )
@@ -30,12 +30,12 @@ async function optIn() {
     client.enable()
     console.log(
       success(
-        "Successfully opted in to budibase analytics. Thank you for helping us make budibase better!"
+        "Successfully opted in to Budibase analytics. Thank you for helping us make Budibase better!"
       )
     )
   } catch (err) {
     console.log(
-      error("Error opting in to budibase analytics. Please try again later.")
+      error("Error opting in to Budibase analytics. Please try again later.")
     )
   }
 }
@@ -51,12 +51,12 @@ async function status() {
 }
 
 const command = new Command(`${CommandWords.ANALYTICS}`)
-  .addHelp("Control the analytics you send to budibase.")
-  .addSubOption("--optin", "Opt in to sending analytics to budibase", optIn)
-  .addSubOption("--optout", "Opt out of sending analytics to budibase.", optOut)
+  .addHelp("Control the analytics you send to Budibase.")
+  .addSubOption("--optin", "Opt in to sending analytics to Budibase", optIn)
+  .addSubOption("--optout", "Opt out of sending analytics to Budibase.", optOut)
   .addSubOption(
     "--status",
-    "Check whether you are currently opted in to budibase analytics.",
+    "Check whether you are currently opted in to Budibase analytics.",
     status
   )