From 0eaf6f1f0fabce3678449d32d269b71e37796be0 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 7 Jan 2020 16:49:19 -0500
Subject: [PATCH] add defaults for s3

---
 .../src/main/resources/models/dist/cloudService.json          | 4 ++--
 bubble-web                                                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bubble-server/src/main/resources/models/dist/cloudService.json b/bubble-server/src/main/resources/models/dist/cloudService.json
index f93e001b..7904a9ed 100644
--- a/bubble-server/src/main/resources/models/dist/cloudService.json
+++ b/bubble-server/src/main/resources/models/dist/cloudService.json
@@ -40,9 +40,9 @@
     "type": "storage",
     "driverClass": "bubble.cloud.storage.s3.S3StorageDriver",
     "driverConfig": {
-      "region": "US_EAST_1",
+      "region": "{{#exists BUBBLE_S3_REGION}}{{BUBBLE_S3_REGION}}{{else}}US_EAST_1{{/exists}}",
       "bucket": "{{BUBBLE_S3_BUCKET}}",
-      "prefix": "{{BUBBLE_S3_BUCKET_PREFIX}}",
+      "prefix": "{{#exists BUBBLE_S3_BUCKET_PREFIX}}{{BUBBLE_S3_BUCKET_PREFIX}}{{else}}bubble_data{{/exists}}",
       "listFetchSize": 100
     },
     "credentials": {
diff --git a/bubble-web b/bubble-web
index 8e6980ee..3fa2b130 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit 8e6980ee1478be86ae59f14cfbb42640dfd651c8
+Subproject commit 3fa2b130a4cff78c7044088da221949a2229dfc2