From 4aec6c74d6e7790486b05a2000cd9be1438df6eb Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Fri, 3 Jan 2020 18:06:40 -0500
Subject: [PATCH] pass env file to server, safer handling of asset override dir

---
 bin/run.sh                                              | 3 +++
 bubble-server/src/main/resources/bubble-config.yml      | 1 +
 bubble-server/src/test/resources/test-bubble-config.yml | 2 +-
 utils/cobbzilla-wizard                                  | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/run.sh b/bin/run.sh
index b985fff5..dc834fab 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -109,6 +109,9 @@ BUBBLE_JVM_OPTS="${BUBBLE_JVM_OPTS} -Djava.net.preferIPv4Stack=true"
 # Choose appropriate log config
 if [[ ${server} -eq 1 ]] ; then
   LOG_CONFIG="-Dlogback.configurationFile=logback.xml"
+  if [[ -f ${BUBBLE_ENV} ]] ; then
+    command="${BUBBLE_ENV}"
+  fi
 else
   LOG_CONFIG="-Dlogback.configurationFile=logback-client.xml"
 fi
diff --git a/bubble-server/src/main/resources/bubble-config.yml b/bubble-server/src/main/resources/bubble-config.yml
index 47ddf460..9bb5c478 100644
--- a/bubble-server/src/main/resources/bubble-config.yml
+++ b/bubble-server/src/main/resources/bubble-config.yml
@@ -34,6 +34,7 @@ database:
 staticAssets:
   baseUri: /
   assetRoot: site/
+  localOverride: {{BUBBLE_ASSETS_DIR}}
   utilPaths:
     INDEX_PATH: /index.html
     INDEX_ALIASES: /:/index.php
diff --git a/bubble-server/src/test/resources/test-bubble-config.yml b/bubble-server/src/test/resources/test-bubble-config.yml
index 811f66f5..42e00c5e 100644
--- a/bubble-server/src/test/resources/test-bubble-config.yml
+++ b/bubble-server/src/test/resources/test-bubble-config.yml
@@ -31,7 +31,7 @@ database:
 staticAssets:
   baseUri: /
   assetRoot: site/
-  localOverride: {{ASSETS_DIR}}
+  localOverride: {{BUBBLE_ASSETS_DIR}}
   singlePageApp: /index.html
   utilPaths:
     INDEX_PATH: /index.html
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 22bc9dc5..e20ad749 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 22bc9dc582dc9d1cf5269ff2fa36e178c97a47c3
+Subproject commit e20ad749d7887eac1c7e6618c9e855c9bcffdfec