From 61d793cabb6a35ada7578a35ee262c7319e3a073 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sun, 15 Nov 2020 14:02:16 -0500
Subject: [PATCH] update docs, launcher

---
 docker/launcher.sh | 68 +++++++++-------------------------------------
 docs/activation.md | 23 ++++++++++++++--
 2 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/docker/launcher.sh b/docker/launcher.sh
index 712972b8..7bfc58be 100644
--- a/docker/launcher.sh
+++ b/docker/launcher.sh
@@ -17,7 +17,10 @@
 #
 
 function die {
-  echo 1>&2 "${1}"
+  echo 1>&2 "
+
+***** ${1}
+"
   exit 1
 }
 
@@ -76,47 +79,8 @@ function setup_docker_ubuntu() {
   sudo apt install -y docker-ce
 }
 
-function setup_docker_centos_dnf() {
-  # Update dnf
-  sudo dnf update -y --nobest
-
-  # Add docker repo
-  sudo dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-
-  # Refresh dnf after adding repo
-  sudo dnf update -y --nobest
-
-  # Install docker
-  sudo dnf install -y docker-ce --best --allowerasing
-
-  # Start docker
-  sudo systemctl start docker
-}
-
-function setup_docker_centos_yum() {
-  # Remove obsolete docker packages
-  sudo yum remove docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine
-
-  # Add docker repo
-  sudo yum install -y yum-utils
-  sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-
-  # Install docker
-  sudo yum install docker-ce docker-ce-cli containerd.io
-
-  # Start docker
-  sudo systemctl start docker
-}
-
-function setup_docker_fedora_dnf() {
-  # Update dnf
-  sudo dnf update -y --nobest
-
-  # Install docker
-  sudo dnf install -y docker-ce
-
-  # Start docker
-  sudo systemctl start docker
+function setup_docker_generic_linux() {
+  curl -fsSL https://get.docker.com | sudo sh -
 }
 
 function setup_docker_linux() {
@@ -125,20 +89,8 @@ function setup_docker_linux() {
     setup_docker_debian
   elif [[ $(echo -n ${DISTRO} | grep -c Ubuntu | tr -d ' ') -gt 0 ]] ; then
     setup_docker_ubuntu
-  elif [[ $(echo -n ${DISTRO} | grep -c CentOS | tr -d ' ') -gt 0 ]] ; then
-    if [[ ! -z "$(which dnf)" ]] ; then
-      setup_docker_centos_dnf
-    elif [[ ! -z "$(which yum)" ]] ; then
-      setup_docker_centos_yum
-    else
-      die "Neither dnf nor yum found, cannot install on CentOS.
-Please install docker manually from https://docker.io/"
-    fi
-  elif [[ $(echo -n ${DISTRO} | grep -c Fedora | tr -d ' ') -gt 0 ]] ; then
-    setup_docker_fedora_dnf
   else
-    die "Automatic docker installation for ${DISTRO} is not yet supported
-Please install docker manually from https://docker.io/"
+    setup_docker_generic_linux
   fi
 }
 
@@ -180,6 +132,12 @@ function run_launcher() {
 
   if [[ -z "$(which docker)" ]] ; then
     setup_docker
+    if [[ -z "$(which docker)" ]] ; then
+      die "Error installing docker
+Install docker manually from https://docs.docker.com/engine/install/
+Then re-run this script
+"
+    fi
   fi
 
   # Determine bubble docker tag
diff --git a/docs/activation.md b/docs/activation.md
index 923b4e7c..01a379b2 100644
--- a/docs/activation.md
+++ b/docs/activation.md
@@ -12,11 +12,30 @@ In order to activate your Local Launcher, you'll need accounts and/or API keys f
 
 Have these account credentials handy. Be prepared to sign up for new accounts where needed.
 
-### Activate via Web UI
+## Activation Notes
+
+### Root User Name
+Do not change the name of the root user. Certain parts of the system have hardcoded references to "root" as the
+name of the admin user.
+
+### Required Clouds
+You must define at least one cloud provider for each of these categories:
+  * DNS (Amazon Route53 or GoDaddy DNS)
+  * Email (SMTP, SendGrid or Mailgun)
+  * Compute (Vultr, DigitalOcean or Amazon EC2)  (note EC2 support is WIP, Vultr and DigitalOcean are stable)
+
+### Initial Domain
+The initial Domain you define during activation must be owned by you, and the DNS provider for this domain must be the
+one selected in the "DNS Provider" drop-down box.
+
+## Activate via Web UI
 The browser-based admin UI should be displaying an "Activate" page. Complete the information on this page and submit the
 data. The Bubble Launcher will create an initial "root" account and other basic system configurations. 
 
-### Activate via command line
+## Activate via command line
+If you installed Bubble from a binary distribution or built it from source, you can also perform activation
+using the Bubble command line tools.
+
 Make a copy of the file `config/activation.json` and edit the copy. There are comments in the file to guide you.
 
 To activate your Local Launcher Bubble, run this command: