From 761838612bbb541c2601326e91c426b208a058ca Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Mon, 15 Nov 2021 16:03:20 +0700
Subject: [PATCH] Use APP_PASSWORD in lightning-terminal

---
 apps/lightning-terminal/data/.gitkeep      | 0
 apps/lightning-terminal/data/.lit/lit.conf | 2 --
 apps/lightning-terminal/docker-compose.yml | 2 ++
 scripts/update/01-run.sh                   | 7 +++++++
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 apps/lightning-terminal/data/.gitkeep
 delete mode 100644 apps/lightning-terminal/data/.lit/lit.conf

diff --git a/apps/lightning-terminal/data/.gitkeep b/apps/lightning-terminal/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/apps/lightning-terminal/data/.lit/lit.conf b/apps/lightning-terminal/data/.lit/lit.conf
deleted file mode 100644
index e958260..0000000
--- a/apps/lightning-terminal/data/.lit/lit.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO: APP_PASSWORD
-uipassword=moneyprintergobrrr
diff --git a/apps/lightning-terminal/docker-compose.yml b/apps/lightning-terminal/docker-compose.yml
index da5542c..e61b2f5 100644
--- a/apps/lightning-terminal/docker-compose.yml
+++ b/apps/lightning-terminal/docker-compose.yml
@@ -13,7 +13,9 @@ services:
       - ${LND_DATA_DIR}:/lnd:ro
     environment:
       HOME: "/data"
+      APP_PASSWORD: "$APP_PASSWORD"
     command:
+        - --uipassword_env=APP_PASSWORD
         - --insecure-httplisten=0.0.0.0:$APP_LIGHTNING_TERMINAL_PORT
         - --network="$BITCOIN_NETWORK"
         - --lnd-mode="remote"
diff --git a/scripts/update/01-run.sh b/scripts/update/01-run.sh
index 3de0d06..23dbb22 100755
--- a/scripts/update/01-run.sh
+++ b/scripts/update/01-run.sh
@@ -236,6 +236,13 @@ if [[ -d "${thunderhub_data_dir}" ]]; then
   cp "${thunderhub_app_entrypoint}" "${thunderhub_data_entrypoint}"
 fi
 
+# Handle stripping hardcoded password for lightning-terminal app
+lightning_terminal_conf="${UMBREL_ROOT}/app-data/lightning-terminal/data/.lit/lit.conf"
+if [[ -f "${lightning_terminal_conf}" ]]; then
+  echo "Found lightning-terminal install, attempting to strip hardcoded password..."
+  sed -i 's/uipassword=moneyprintergobrrr//' "${lightning_terminal_conf}"
+fi
+
 # Fix permissions
 echo "Fixing permissions"
 find "$UMBREL_ROOT" -path "$UMBREL_ROOT/app-data" -prune -o -exec chown 1000:1000 {} +