From 120d407d38eca25c92fd31ce86aed9125b456e6b Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Sat, 8 Jul 2023 12:53:34 +0000
Subject: [PATCH] lnd: Restart=always and clean config (#3986)

* lnd.service: use Restart=always

* lnd.check: remove erroneous    [rpcmiddleware]

* remove [[Rr]pcmiddleware] entries
---
 home.admin/assets/lnd.service            | 2 +-
 home.admin/config.scripts/lnd.check.sh   | 4 ++++
 home.admin/config.scripts/lnd.install.sh | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/home.admin/assets/lnd.service b/home.admin/assets/lnd.service
index e5def985d..96cfa571d 100644
--- a/home.admin/assets/lnd.service
+++ b/home.admin/assets/lnd.service
@@ -22,7 +22,7 @@ User=bitcoin
 Group=bitcoin
 
 # Try restarting lnd if it stops due to a failure
-Restart=on-failure
+Restart=always
 RestartSec=60
 
 # Type=notify is required for lnd to notify systemd when it is ready
diff --git a/home.admin/config.scripts/lnd.check.sh b/home.admin/config.scripts/lnd.check.sh
index d83011f8f..2d205a2ad 100755
--- a/home.admin/config.scripts/lnd.check.sh
+++ b/home.admin/config.scripts/lnd.check.sh
@@ -332,6 +332,10 @@ if [ "$1" == "prestart" ]; then
 " | tee -a ${lndConfFile}
   fi
 
+  # remove erroneous entries
+  sudo sed -i '/^  \[rpcmiddleware\]/d' ${lndConfFile}
+  sudo sed -i '/^  \[\[Rr\]pcmiddleware\]/d' ${lndConfFile}
+
   # SET/UPDATE rpcmiddleware.enable
   setting ${lndConfFile} ${insertLine} "rpcmiddleware.enable" "true"
 
diff --git a/home.admin/config.scripts/lnd.install.sh b/home.admin/config.scripts/lnd.install.sh
index 89544a1a0..660b6e61f 100644
--- a/home.admin/config.scripts/lnd.install.sh
+++ b/home.admin/config.scripts/lnd.install.sh
@@ -350,8 +350,8 @@ PIDFile=/home/bitcoin/.lnd/${netprefix}lnd.pid
 User=bitcoin
 Group=bitcoin
 
-# Try restarting lnd if it stops due to a failure
-Restart=on-failure
+# Try to restart lnd always
+Restart=always
 RestartSec=60
 
 # Type=notify is required for lnd to notify systemd when it is ready