From 8b34fc9353be6487dde0bbfb649d91a2f6028504 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 6 Jan 2020 20:31:11 -0500
Subject: [PATCH] activation tweaks

---
 .../src/main/resources/models/dist/cloudService.json        | 6 +++---
 dist-README.md                                              | 6 +++++-
 utils/cobbzilla-wizard                                      | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bubble-server/src/main/resources/models/dist/cloudService.json b/bubble-server/src/main/resources/models/dist/cloudService.json
index 185e0bbd..1dababa5 100644
--- a/bubble-server/src/main/resources/models/dist/cloudService.json
+++ b/bubble-server/src/main/resources/models/dist/cloudService.json
@@ -31,7 +31,7 @@
     "name": "LocalStorage",
     "type": "storage",
     "driverClass": "bubble.cloud.storage.local.LocalStorageDriver",
-    "driverConfig": { "baseDir": "{{LOCALSTORAGE_BASE_DIR}}" },
+    "driverConfig": { "baseDir": "{{#exists LOCALSTORAGE_BASE_DIR}}{{LOCALSTORAGE_BASE_DIR}}{{else}}.bubble_local_storage{{/exists}}" },
     "template": false
   },
 
@@ -72,7 +72,7 @@
   {
     "name": "SmtpServer",
     "type": "email",
-    "driverClass": "{{BUBBLE_SMTP_DRIVER}}",
+    "driverClass": "bubble.cloud.email.SmtpEmailDriver",
     "driverConfig": {
       "tlsEnabled": true
     },
@@ -90,7 +90,7 @@
   {
     "name": "TwilioSms",
     "type": "sms",
-    "driverClass": "{{BUBBLE_SMS_DRIVER}}",
+    "driverClass": "bubble.cloud.sms.twilio.TwilioSmsDriver",
     "driverConfig": {},
     "credentials": {
       "params": [
diff --git a/dist-README.md b/dist-README.md
index 6fa21aea..a542f7a4 100644
--- a/dist-README.md
+++ b/dist-README.md
@@ -18,8 +18,12 @@ will also be "yours only" -- all Bubbles disconnect from their launcher during c
 
 ## Getting Started
 
+### Install OpenJDK 11
+Install [Java 11](https://openjdk.java.net/install/) from OpenJDK.
+It will probably be easier to install using an OS package, for example `sudo apt install openjdk-11-jre-headless`
+
 ### Install PostgreSQL and Redis
-Install [PostgreSQL](https://www.postgresql.org/download/) if it is not installed on your system.
+Install [PostgreSQL 10](https://www.postgresql.org/download/) if it is not installed on your system.
 It will probably be easier to install using an OS package, for example `sudo apt install postgresql`
 
 Install [Redis](https://redis.io/download) if it is not already installed on your system.
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 115f3c32..97469af0 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 115f3c322f49948a31910e55c8909c67233ea623
+Subproject commit 97469af03d871cb39168f3d6f20b56b495b5ccdb