diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh index 9e2654d..70a2b4f 100755 --- a/home.admin/00infoBlitz.sh +++ b/home.admin/00infoBlitz.sh @@ -163,6 +163,7 @@ if [ "${onionAddress}" != "null" ]; then public_color="${color_green}" torInfo="+ TOR" else + # IP address networkConnectionsInfo="${color_purple}${networkConnections} ${color_gray}connections" public_addr="${public_ip}:${public_port}" @@ -183,6 +184,25 @@ else # if a LONG IPv6 address dont show "Public" in front to save space public_addr_pre="" fi + + # DynDNS + if [ ${#dynDomain} -get 0 ]; then + + #check if dyndns resolves to correct IP + ipOfDynDNS=$(getent hosts rootzoll.chickenkiller.com | awk '{ print $1 }') + if [ "${ipOfDynDNS}" != "${public_addr}" ]; then + public_color="${color_red}" + else + public_color="${color_yellow}" + fi + + # replace IP display with dynDNS + public_addr_pre="DynDNS " + networkConnectionsInfo="" + public_addr="${dynDomain}" + + fi + fi # LIGHTNING NETWORK diff --git a/home.admin/_background.sh b/home.admin/_background.sh index f4113ae..d1260fd 100644 --- a/home.admin/_background.sh +++ b/home.admin/_background.sh @@ -128,16 +128,6 @@ do passwordC=$(cat /root/lnd.autounlock.pwd) sudo python /home/admin/config.scripts/lnd.unlock.py '$passwordC' - #walletPasswordBase64=$(cat /root/lnd.autounlock.pwd | tr -d '\n' | base64 -w0) - #MACAROON_HEADER="Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 /mnt/hdd/lnd/data/chain/${network}/${chain}net/admin.macaroon)" - #POSTDATA="'{ \"wallet_password\":\"${walletPasswordBase64}\" }'" - #echo "MACAROON:${MACAROON_HEADER}" - #echo "POSTDATA:${POSTDATA}" - #command="sudo sh -c "curl -X POST -d ${POSTDATA} --cacert /home/bitcoin/.lnd/tls.cert --header \"$MACAROON_HEADER\" https://localhost:8080/v1/unlockwallet" - #echo "COMMAND:${command}" - #result=$(echo \"restlisten=\" >> /mnt/hdd/lnd/lnd.conf") - #echo "RESULT:${result}" - else echo "lncli says not locked" fi