From 53c2f2e132913c8763c2450ecb73c5c896a77415 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sat, 27 Apr 2019 16:14:26 +0200
Subject: [PATCH] refix #324

---
 home.admin/XXcleanHDD.sh           |  1 +
 home.admin/_bootstrap.provision.sh | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/home.admin/XXcleanHDD.sh b/home.admin/XXcleanHDD.sh
index c53c274ea..95c017c81 100755
--- a/home.admin/XXcleanHDD.sh
+++ b/home.admin/XXcleanHDD.sh
@@ -64,6 +64,7 @@ else
     sudo rm -f -r /mnt/hdd/download
     sudo rm -f -r /mnt/hdd/tor
     sudo rm -f -r /mnt/hdd/temp
+    sudo rm -f -r /mnt/hdd/backup_lnd
     sudo rm -f /mnt/hdd/raspiblitz.conf
     sudo rm -f /home/admin/raspiblitz.info
     
diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index f2b906c57..301c1c1c1 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -215,18 +215,19 @@ else
     echo "Backup Torrent Hosting - not active" >> ${logFile}
 fi
 
-# replay backup LND dir (especially for macaroons and tlscerts)
+# replay backup LND conf & tlscerts
 # https://github.com/rootzoll/raspiblitz/issues/324
 echo "" >> ${logFile}
-echo "*** Replay backup of LND directory" >> ${logFile}
+echo "*** Replay backup of LND conf/tls" >> ${logFile}
 if [ -d "/mnt/hdd/backup_lnd" ]; then
-  echo "Copying ..." >> ${logFile}
-  sudo cp -r /mnt/hdd/backup_lnd/* /mnt/hdd/lnd >> ${logFile} 2>&1
-  echo "Updating user admin creds ..." >> ${logFile}
-  sudo cp /mnt/hdd/lnd/lnd.conf /home/admin/.lnd/lnd.conf >> ${logFile} 2>&1
-  sudo cp /mnt/hdd/lnd/tls.cert /home/admin/.lnd/tls.cert >> ${logFile} 2>&1
-  sudo cp -r /mnt/hdd/lnd/data/chain /home/admin/.lnd/data/chain >> ${logFile} 2>&1
-  sudo chown -R admin:admin /home/admin/.lnd >> ${logFile} 2>&1
+
+  echo "Copying TLS ..." >> ${logFile}
+  sudo cp /mnt/hdd/backup_lnd/lnd.conf /mnt/hdd/lnd/lnd.conf >> ${logFile} 2>&1
+  sudo cp /mnt/hdd/backup_lnd/tls.cert /mnt/hdd/lnd/tls.cert >> ${logFile} 2>&1
+  sudo cp /mnt/hdd/backup_lnd/tls.key /mnt/hdd/lnd/tls.key >> ${logFile} 2>&1
+  sudo chown -R bitcoin:bitcoin /mnt/hdd/lnd >> ${logFile} 2>&1
+  echo "On next final restart admin creds will be updated by _boostrap.sh" >> ${logFile}
+
   echo "DONE" >> ${logFile}
 else
   echo "No BackupDir so skipping that step." >> ${logFile}