highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-27 20:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

moved publicIP to raspiconf file

Browse Source
This commit is contained in:
rootzoll
2018-12-11 00:53:07 +01:00
parent 69cd2c6026
commit b50b2cceb3
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
home.admin/_bootstrap.sh
View File

@@ -66,15 +66,6 @@ if [ ${afterSetupScriptExists} -eq 1 ]; then
sleep 100
fi
################################
# PUBLIC IP
# for LND on startup
################################
printf "PUBLICIP=$(curl -vv ipinfo.io/ip 2> /run/publicip.log)\n" > /run/publicip;
chmod 774 /run/publicip
################################
# HDD CHECK & PRE-INIT
################################
@@ -221,14 +212,37 @@ if [ ${hddIsAutoMounted} -eq 0 ]; then
sudo umount -l /mnt/hdd
exit 0
fi # END - no automount
#####################################
# UPDATE HDD CONFIG FILE (if exists)
#####################################
echo "Check if HDD contains configuration .." >> $logFile
configExists=$(ls ${configFile} | grep -c '.conf')
if [ ${configExists} -eq 1 ]; then
# load values
echo "load and update publicIP" >> $logFile
source ${configFile}
# update public IP on boot
freshPublicIP=$(curl -vv ipinfo.io/ip 2>/dev/null)
if [ ${#publicIP} -eq 0 ]; then
echo "create value (${freshPublicIP})" >> $logFile
echo "publicIP=${freshPublicIP}" >> $configFile
else
echo "update value (${freshPublicIP})" >> $logFile
sed -i "s/^publicIP=.*/publicIP=${freshPublicIP}/g" ${configFile}
fi
fi
################################
# INFOFILE BASICS
# SD INFOFILE BASICS
################################
# EXIT on BOOTSTRAP HERE AT THE MOMENT
echo "DONE BOOTSTRAP (before any configs etc)" >> $logFile
sed -i "s/^state=.*/state=ready/g" ${infoFile}
sed -i "s/^message=.*/message='waiting login'/g" ${infoFile}
echo "DONE BOOTSTRAP" >> $logFile
exit 0

2
home.admin/assets/lnd.service
View File

@@ -9,7 +9,7 @@ After=bitcoind.service
#OnFailure=systemd-sendmail@%n
[Service]
EnvironmentFile=/run/publicip
EnvironmentFile=/mnt/hdd/raspiblitz.conf
ExecStart=/usr/local/bin/lnd --externalip=${PUBLICIP}
PIDFile=/home/bitcoin/.lnd/lnd.pid
User=bitcoin

9
home.admin/assets/lnd.tor.service
View File

@@ -9,15 +9,8 @@ After=bitcoind.service
#OnFailure=systemd-sendmail@%n
[Service]
# get var PUBIP from file
EnvironmentFile=/mnt/hdd/tor/v3Address
# TOR Hidden Service v2
EnvironmentFile=/mnt/hdd/raspiblitz.conf
ExecStart=/usr/local/bin/lnd --tor.active --tor.v2 --listen=127.0.0.1:9735
# TOR Hidden Service v3
# ExecStart=/usr/local/bin/lnd --tor.active --tor.v3 --externalip=${V3ADDRESS} --listen=127.0.0.1:9735
PIDFile=/home/bitcoin/.lnd/lnd.pid
User=bitcoin
Group=bitcoin