From 9bbc38ebeff58a82b8113667b7772a3c01bd217d Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 11 Dec 2018 02:04:55 +0100
Subject: [PATCH] publiIp to raspi conf

---
 home.admin/95finalSetup.sh               | 6 ++++++
 home.admin/assets/lnd.service            | 4 ++--
 home.admin/config.scripts/lnd.autonat.sh | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/home.admin/95finalSetup.sh b/home.admin/95finalSetup.sh
index 2efa387..17128f1 100755
--- a/home.admin/95finalSetup.sh
+++ b/home.admin/95finalSetup.sh
@@ -30,6 +30,12 @@ echo "chain=${chain}" >> $configFile
 # let migration/init script do the rest
 ./_bootstrap.migration.sh
 
+# set raspi config as environment for lnd service
+sudo systemctl stop lnd
+sudo systemctl disable lnd
+sed -i "s/^EnvironmentFile=.*/EnvironmentFile=${configFile}/g" /etc/systemd/system/lnd.service
+sudo systemctl enable lnd
+
 # copy logfile to analyse setup
 cp $logFile /home/admin/raspiblitz.setup.log
 
diff --git a/home.admin/assets/lnd.service b/home.admin/assets/lnd.service
index 593c07c..79a40fd 100644
--- a/home.admin/assets/lnd.service
+++ b/home.admin/assets/lnd.service
@@ -9,8 +9,8 @@ After=bitcoind.service
 #OnFailure=systemd-sendmail@%n
 
 [Service]
-EnvironmentFile=/mnt/hdd/raspiblitz.conf
-ExecStart=/usr/local/bin/lnd --externalip=${PUBLICIP}
+EnvironmentFile=
+ExecStart=/usr/local/bin/lnd --externalip=${publicIP}
 PIDFile=/home/bitcoin/.lnd/lnd.pid
 User=bitcoin
 Group=bitcoin
diff --git a/home.admin/config.scripts/lnd.autonat.sh b/home.admin/config.scripts/lnd.autonat.sh
index 0bacc07..fe22886 100644
--- a/home.admin/config.scripts/lnd.autonat.sh
+++ b/home.admin/config.scripts/lnd.autonat.sh
@@ -66,7 +66,7 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
   sudo sed -i "s/^nat=.*/nat=false/g" /mnt/hdd/lnd/lnd.conf
   # editing lnd service (adding the static publicip) 
   echo "editing /etc/systemd/system/lnd.service"
-  sudo sed -i "s/^ExecStart=\/usr\/local\/bin\/lnd.*/ExecStart=\/usr\/local\/bin\/lnd --externalip=\${PUBLICIP}/g" /etc/systemd/system/lnd.service
+  sudo sed -i "s/^ExecStart=\/usr\/local\/bin\/lnd.*/ExecStart=\/usr\/local\/bin\/lnd --externalip=\${publicIP}/g" /etc/systemd/system/lnd.service
   # edit raspi blitz config
   echo "editing /mnt/hdd/raspiblitz.conf"
   sudo sed -i "s/^autoNatDiscovery=.*/autoNatDiscovery=off/g" /mnt/hdd/raspiblitz.conf