From f180f080f903520166b9445c7a1336e0aa4310b0 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 21 Feb 2019 13:53:38 -0500
Subject: [PATCH] fabric updates

---
 util/DigitalOceanMarketplace/fabfile.py          |  2 ++
 .../files/etc/update-motd.d/99-bitwarden-welcome | 12 ++++++++++--
 .../files/opt/bitwarden/install-bitwarden.sh     | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/util/DigitalOceanMarketplace/fabfile.py b/util/DigitalOceanMarketplace/fabfile.py
index 3a9631857..0e1bd49f7 100644
--- a/util/DigitalOceanMarketplace/fabfile.py
+++ b/util/DigitalOceanMarketplace/fabfile.py
@@ -14,6 +14,8 @@ def clean_up():
     """
     Clean up remote machine before taking snapshot.
     """
+    run("apt-get -y update")
+    run("apt-get -y upgrade")
     run("rm -rf /tmp/* /var/tmp/*")
     run("history -c")
     run("cat /dev/null > /root/.bash_history")
diff --git a/util/DigitalOceanMarketplace/files/etc/update-motd.d/99-bitwarden-welcome b/util/DigitalOceanMarketplace/files/etc/update-motd.d/99-bitwarden-welcome
index 32e916b31..4edccbc2d 100644
--- a/util/DigitalOceanMarketplace/files/etc/update-motd.d/99-bitwarden-welcome
+++ b/util/DigitalOceanMarketplace/files/etc/update-motd.d/99-bitwarden-welcome
@@ -9,10 +9,18 @@ cat <<EOF
 Welcome to your Bitwarden server
   https://bitwarden.com
 
-Self-hosted documentation:
-  https://help.bitwarden.com/article/install-on-premise/
+Complete documentation:
   https://help.bitwarden.com/hosting/
 
+Configuration:
+  Configuration changes can be made in `/root/bwdata/config.yml` and
+  `/root/bwdata/env/global.override.env`.
+
+Common commands:
+  /root/bitwarden.sh stop
+  /root/bitwarden.sh restart
+  /root/bitwarden.sh rebuild
+
 ********************************************************************************
 To delete this message of the day: rm -rf $(readlink -f ${0})
 EOF
diff --git a/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh b/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh
index 71a30a839..b7188411a 100644
--- a/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh
+++ b/util/DigitalOceanMarketplace/files/opt/bitwarden/install-bitwarden.sh
@@ -5,16 +5,32 @@
 # ref: https://help.bitwarden.com/article/install-on-premise/
 #
 
+echo -e ''
+echo -e 'Installing Bitwarden...'
+echo -e ''
+
 /root/bitwarden.sh install
 
+echo -e ''
+echo -e 'Starting Bitwarden containers...'
+echo -e ''
+
 /root/bitwarden.sh start
 
+echo -e ''
 echo -e 'Waiting for Bitwarden database container to come online...'
 
 sleep 30s
 
+echo -e 'Initializing Bitwarden database...'
+echo -e ''
+
 /root/bitwarden.sh updatedb
 
+echo -e ''
+echo -e 'Bitwarden installation complete.'
+echo -e ''
+
 #
 # Setup Bitwarden update cron
 # ref: https://help.bitwarden.com/article/updating-on-premise/