From 851326886a72c2c9c2e99aa0f9ed324914579ca2 Mon Sep 17 00:00:00 2001 From: Chacham Chanukah Date: Sun, 5 May 2019 11:49:25 +0300 Subject: [PATCH 1/7] Change to source address --- home.admin/91addBonus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home.admin/91addBonus.sh b/home.admin/91addBonus.sh index 21d6be8..7183693 100755 --- a/home.admin/91addBonus.sh +++ b/home.admin/91addBonus.sh @@ -6,8 +6,8 @@ echo "Creating the command lnbalance as well as lnchannels which will give you a cd mkdir /home/admin/tmpScriptDL cd /home/admin/tmpScriptDL -wget https://raw.githubusercontent.com/Stadicus/guides/master/raspibolt/resources/lnbalance -wget https://raw.githubusercontent.com/Stadicus/guides/master/raspibolt/resources/lnchannels +wget https://stadicus.github.io/RaspiBolt/resources/lnbalance +wget https://stadicus.github.io/RaspiBolt/resources/lnchannels chmod +x lnbalance chmod +x lnchannels sudo cp lnchannels /usr/local/bin From a31c0a81ac87655aef64262f809469a4ab3ce23b Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Tue, 7 May 2019 16:56:31 +0200 Subject: [PATCH 2/7] add raspiblitz.com shopping list --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d4e0a53..9969fe4 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,17 @@ The RaspiBlitz is build from the following parts: * Powersupply >=3A (choose big & stable output) * Cheap Casing -**All together under 150 USD / 130 EUR (depending on country & shop)** +**All single parts together under 150 USD / 130 EUR ... depending on country & shop, see shopping lists below.** -## Amazon Shopping Lists +### Buy a ready-2-go RaspiBlitz (Germany, EU and International) -These are the community currated shopping lists based on country: +If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a Hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) + +**To list your local/national RaspiBlitz shop here or on raspiblitz.com, get in contact: christian@fulmo.org** + +### International Shopping Lists (buy parts & build it yourself) + +The cheapest way is to buy ans assemble the single parts yourself. These are the community currated shopping lists based on country: * [Germany](shoppinglist_de.md) *(reference shopping list)* * [USA](shoppinglist_usa.md) From 1ca241930618051638981b260c8b7b97ad2a4c4b Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Tue, 7 May 2019 16:58:54 +0200 Subject: [PATCH 3/7] changed wording --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9969fe4..80da80d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The RaspiBlitz is build from the following parts: ### Buy a ready-2-go RaspiBlitz (Germany, EU and International) -If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a Hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) +If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a all-you-need-hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) **To list your local/national RaspiBlitz shop here or on raspiblitz.com, get in contact: christian@fulmo.org** From 259de1b21f527761175567cf982b426f9f9b7653 Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Tue, 7 May 2019 17:03:53 +0200 Subject: [PATCH 4/7] added payment info --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80da80d..c3305e8 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The RaspiBlitz is build from the following parts: ### Buy a ready-2-go RaspiBlitz (Germany, EU and International) -If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a all-you-need-hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) +If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a all-you-need-hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) (pay with Bitcoin/Lightning or with deprecated PayPal/CreditCard) **To list your local/national RaspiBlitz shop here or on raspiblitz.com, get in contact: christian@fulmo.org** From 4039d26d7c3933d6e771af82e3bbca1f18c30d8a Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Tue, 7 May 2019 17:06:36 +0200 Subject: [PATCH 5/7] italic font --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c3305e8..6c31d6e 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ The RaspiBlitz is build from the following parts: ### Buy a ready-2-go RaspiBlitz (Germany, EU and International) -If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a all-you-need-hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) (pay with Bitcoin/Lightning or with deprecated PayPal/CreditCard) +If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a all-you-need-hardwareset for yourself or for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) *(pay with Bitcoin/Lightning or with deprecated PayPal/CreditCard)* -**To list your local/national RaspiBlitz shop here or on raspiblitz.com, get in contact: christian@fulmo.org** +*To list your local/national RaspiBlitz shop here or on raspiblitz.com, get in contact: christian@fulmo.org* ### International Shopping Lists (buy parts & build it yourself) From eb0af49e86d42cb54556841d36ceb68330609606 Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Tue, 7 May 2019 17:11:03 +0200 Subject: [PATCH 6/7] add shop link to workshop readme --- WORKSHOP.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WORKSHOP.md b/WORKSHOP.md index f7039b8..ee38c46 100644 --- a/WORKSHOP.md +++ b/WORKSHOP.md @@ -118,6 +118,8 @@ See the shopping list on the RaspiBlitz Github README - you need to buy all of t From experience start ordering two weeks before the workshop (if you need to assembly) and minimum one week if you handing out hardware kits - even if you have Amazon Prime. There is always a shipment comming late - its a lot of packages. +If you like to support the RaspiBlitz project you can order a ready-2-go RaspiBlitz or a all-you-need-hardwareset for your RaspiBlitz workshop from [raspiblitz.com](https://raspiblitz.com) + ## Instruct Participants to bring Hardware If you run the scenario of people bringing their own hardware. Make sure to let them know at least a week before the event so that there is enough time for online ordering. Also make sure that especially the power supply needs to provide 3A and a stable current (big fat with a thick cable is good) - because thats the most often error source if people just reuse some old weak power supply. From 9f1a72169016c96831d4e65b0ade3b59dbc155d4 Mon Sep 17 00:00:00 2001 From: Christian Rotzoll Date: Thu, 9 May 2019 20:06:43 +0200 Subject: [PATCH 7/7] #588 fix error output debug.log --- home.admin/00raspiblitz.sh | 8 ++++---- home.admin/70initLND.sh | 2 +- home.admin/AAunlockLND.sh | 2 +- home.admin/_bootstrap.sh | 2 +- home.admin/config.scripts/blitz.statusscan.sh | 8 ++++---- home.admin/config.scripts/network.reindex.sh | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index 17d9cba..5dd68eb 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -80,10 +80,10 @@ if [ "${state}" = "presync" ]; then # stopping the pre-sync echo "" # analyse if blockchain was detected broken by pre-sync - blockchainBroken=$(sudo tail /mnt/hdd/bitcoin/debug.log | grep -c "Please restart with -reindex or -reindex-chainstate to recover.") + blockchainBroken=$(sudo tail /mnt/hdd/bitcoin/debug.log 2>/dev/null | grep -c "Please restart with -reindex or -reindex-chainstate to recover.") if [ ${blockchainBroken} -eq 1 ]; then # dismiss if its just a date thing - futureBlock=$(sudo tail /mnt/hdd/bitcoin/debug.log | grep "Please restart with -reindex or -reindex-chainstate to recover." | grep -c "block database contains a block which appears to be from the future") + futureBlock=$(sudo tail /mnt/hdd/bitcoin/debug.log 2>/dev/null | grep "Please restart with -reindex or -reindex-chainstate to recover." | grep -c "block database contains a block which appears to be from the future") if [ ${futureBlock} -gt 0 ]; then blockchainBroken=0 echo "-> Ignore reindex - its just a future block" @@ -172,10 +172,10 @@ waitUntilChainNetworkIsReady() if [ ${#clienterror} -gt 0 ]; then # analyse LOGS for possible reindex - reindex=$(sudo cat /mnt/hdd/${network}/debug.log | grep -c 'Please restart with -reindex or -reindex-chainstate to recover') + reindex=$(sudo cat /mnt/hdd/${network}/debug.log 2>/dev/null | grep -c 'Please restart with -reindex or -reindex-chainstate to recover') if [ ${reindex} -gt 0 ]; then # dismiss if its just a date thing - futureBlock=$(sudo tail /mnt/hdd/${network}/debug.log | grep "Please restart with -reindex or -reindex-chainstate to recover" | grep -c "block database contains a block which appears to be from the future") + futureBlock=$(sudo tail /mnt/hdd/${network}/debug.log 2>/dev/null | grep "Please restart with -reindex or -reindex-chainstate to recover" | grep -c "block database contains a block which appears to be from the future") if [ ${futureBlock} -gt 0 ]; then blockchainBroken=0 echo "-> Ignore reindex - its just a future block" diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh index 33819cd..3f8e4ac 100755 --- a/home.admin/70initLND.sh +++ b/home.admin/70initLND.sh @@ -437,7 +437,7 @@ fi ###### Unlock Wallet (if needed) echo "*** Check Wallet Lock ***" -locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -c unlock) +locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2>/dev/null | grep -c unlock) if [ ${locked} -gt 0 ]; then echo "OK - Wallet is locked ... starting unlocking dialog" /home/admin/AAunlockLND.sh diff --git a/home.admin/AAunlockLND.sh b/home.admin/AAunlockLND.sh index 9698fca..8bbc323 100755 --- a/home.admin/AAunlockLND.sh +++ b/home.admin/AAunlockLND.sh @@ -22,7 +22,7 @@ while : do sudo -u bitcoin /usr/local/bin/lncli --chain=${network} unlock sleep 4 - locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -c unlock) + locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2>/dev/null | grep -c unlock) if [ ${locked} -eq 0 ]; then break fi diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index d5616cd..de27af6 100644 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -274,7 +274,7 @@ if [ ${hddIsAutoMounted} -eq 0 ]; then #presyncActive=$(systemctl status bitcoind | grep -c 'could not be found') echo "starting pre-sync in background" >> $logFile # make sure that debug file is clean, so just pre-sync gets analysed on stop - sudo rm /mnt/hdd/bitcoin/debug.log + sudo rm /mnt/hdd/bitcoin/debug.log 2>/dev/null # starting in background, because this scripts is part of systemd # so to change systemd needs to happen after delay in seperate process sudo chown -R bitcoin:bitcoin /mnt/hdd/bitcoin 2>> $logFile diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh index b170b17..8342a0e 100644 --- a/home.admin/config.scripts/blitz.statusscan.sh +++ b/home.admin/config.scripts/blitz.statusscan.sh @@ -84,7 +84,7 @@ else #### HARD PROBLEMS # LOW DISK SPACE - lowDiskSpace=$(sudo tail -n 100 /mnt/hdd/${network}${pathAdd}/debug.log | grep -c "Error: Disk space is low!") + lowDiskSpace=$(sudo tail -n 100 /mnt/hdd/${network}${pathAdd}/debug.log 2>/dev/null | grep -c "Error: Disk space is low!") if [ ${lowDiskSpace} -gt 0 ]; then bitcoinErrorShort="HDD DISK SPACE LOW" bitcoinErrorFull="HDD DISK SPACE LOW - check what data you can delete on HDD and restart" @@ -94,7 +94,7 @@ else # if still no error identified - search logs for generic error (after 4min uptime) if [ ${#bitcoinErrorShort} -eq 0 ] && [ ${uptime} -gt 240 ]; then - bitcoinErrorFull=$(sudo tail -n 100 /mnt/hdd/${network}${pathAdd}/debug.log | grep -c "Error:" | tail -1 | tr -d "'") + bitcoinErrorFull=$(sudo tail -n 100 /mnt/hdd/${network}${pathAdd}/debug.log 2>/dev/null | grep -c "Error:" | tail -1 | tr -d "'") if [ ${#bitcoinErrorFull} -gt 0 ]; then bitcoinErrorShort="Error found in Logs" fi @@ -137,10 +137,10 @@ if [ ${lndRunning} -eq 1 ]; then # find a the line number in logs of start of LND # just do this on error case to save on processing memory - lndStartLineNumber=$(sudo cat /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -in "LTND: Active chain:" | tail -1 | cut -d ":" -f1) + lndStartLineNumber=$(sudo cat /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2>/dev/null | grep -in "LTND: Active chain:" | tail -1 | cut -d ":" -f1) # get logs of last LND start - lndLogsAfterStart=$(sudo tail --lines=+${lndStartLineNumber} /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log) + lndLogsAfterStart=$(sudo tail --lines=+${lndStartLineNumber} /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2>/dev/null) # check RPC server ready (can take some time after wallet was unlocked) lndRPCReady=$(echo "${lndLogsAfterStart}" | grep -c "RPCS: RPC server listening on") diff --git a/home.admin/config.scripts/network.reindex.sh b/home.admin/config.scripts/network.reindex.sh index 0b41228..3a15918 100755 --- a/home.admin/config.scripts/network.reindex.sh +++ b/home.admin/config.scripts/network.reindex.sh @@ -98,6 +98,6 @@ echo "*************************" sudo -u bitcoin ${network}-cli stop sleep 4 # clean logs (to prevent a false reindex detection) -sudo rm /mnt/hdd/${network}/debug.log +sudo rm /mnt/hdd/${network}/debug.log 2>/dev/null # reboot sudo shutdown -r now \ No newline at end of file