From 364aee61a29a37c1102045c122c2df807072c64e Mon Sep 17 00:00:00 2001 From: bitromortac Date: Thu, 27 Aug 2020 06:35:13 +0200 Subject: [PATCH 01/12] Update lndmanage to v0.11.0 --- home.admin/config.scripts/bonus.lndmanage.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/home.admin/config.scripts/bonus.lndmanage.sh b/home.admin/config.scripts/bonus.lndmanage.sh index 10882e446..bf628022e 100644 --- a/home.admin/config.scripts/bonus.lndmanage.sh +++ b/home.admin/config.scripts/bonus.lndmanage.sh @@ -17,8 +17,8 @@ fi # show info menu if [ "$1" = "menu" ]; then dialog --title " Info lndmanage " --msgbox "\n\ -Usage: https://github.com/bitromortac/lndmanage/blob/master/README.md -Have at least one channel active to run it without error.\n +Usage: https://github.com/bitromortac/lndmanage/blob/master/README.md or +lndmanage --help.\n To start type: 'manage' in the command line. " 9 75 exit 0 @@ -42,10 +42,11 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then python3 -m venv venv source /home/admin/lndmanage/venv/bin/activate - # get dependencies - sudo apt install -y python3-dev libatlas-base-dev - python3 -m pip install wheel - python3 -m pip install lndmanage==0.10.0 + # get build dependencies + python3 -m pip install --upgrade pip wheel setuptools + + # install lndmanage + python3 -m pip install lndmanage==0.11.0 # check if install was successfull if [ $(python3 -m pip list | grep -c "lndmanage") -eq 0 ]; then @@ -60,8 +61,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then sudo sed -i "s/^lndmanage=.*/lndmanage=on/g" /mnt/hdd/raspiblitz.conf echo "# usage: https://github.com/bitromortac/lndmanage/blob/master/README.md" + echo "# usage: lndmanage --help" echo "# To start type: 'manage' in the command line." - echo "# Needs at least one channel to start without error." echo "# To exit the venv - type 'deactivate' and press ENTER" exit 0 From 759a0ba2f0ee7dbb50858df457905b9dfce432ab Mon Sep 17 00:00:00 2001 From: openoms Date: Fri, 4 Sep 2020 19:54:46 +0100 Subject: [PATCH 02/12] updateMenu: tweak whiptail window --- home.admin/99updateMenu.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/home.admin/99updateMenu.sh b/home.admin/99updateMenu.sh index 8e87816b2..ff93bf9c2 100644 --- a/home.admin/99updateMenu.sh +++ b/home.admin/99updateMenu.sh @@ -8,10 +8,11 @@ source /home/admin/_version.info clear # Basic Options -OPTIONS=(RELEASE "RaspiBlitz Release Update/Recovery" \ - LND "Interim LND Update Options" \ - PATCH "Patch RaspiBlitz v${codeVersion}" - ) +OPTIONS=( +RELEASE "RaspiBlitz Release Update/Recovery" \ +LND "Interim LND Update Options" \ +PATCH "Patch RaspiBlitz v${codeVersion}" +) if [ "${bos}" == "on" ]; then OPTIONS+=(BOS "Update Balance of Satoshis") @@ -20,7 +21,7 @@ if [ "${thunderhub}" == "on" ]; then OPTIONS+=(THUB "Update ThunderHub") fi -CHOICE=$(whiptail --clear --title "Update Options" --menu "" 12 55 5 "${OPTIONS[@]}" 2>&1 >/dev/tty) +CHOICE=$(whiptail --clear --title "Update Options" --menu "" 13 55 6 "${OPTIONS[@]}" 2>&1 >/dev/tty) release() { From 92c609bc3245a8cf6303aaa46c6dcd9c204fcbed Mon Sep 17 00:00:00 2001 From: Robert Habermann Date: Sat, 5 Sep 2020 22:30:19 +0200 Subject: [PATCH 03/12] setup logrotate for Tor on ext. disk --- home.admin/config.scripts/internet.tor.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh index 27591f39c..3f5e3b545 100755 --- a/home.admin/config.scripts/internet.tor.sh +++ b/home.admin/config.scripts/internet.tor.sh @@ -377,6 +377,28 @@ EOF /home/admin/config.scripts/internet.hiddenservice.sh lnbits 80 5000 fi + echo "Setup logrotate" + if ! grep -Eq "^/mnt/hdd/tor/" /etc/logrotate.d/tor; then + # add logrotate config for modified Tor dir on ext. disk + cat << EOF | sudo tee -a /etc/logrotate.d/tor >/dev/null +/mnt/hdd/tor/*log { + daily + rotate 5 + compress + delaycompress + missingok + notifempty + create 0640 bitcoin bitcoin + sharedscripts + postrotate + if invoke-rc.d tor status > /dev/null; then + invoke-rc.d tor reload > /dev/null + fi + endscript +} +EOF + fi + echo "OK - TOR is now ON" echo "needs reboot to activate new setting" exit 0 From bebcc38f0e6a0741fe0ffb0a1e6f5c7fa6770a35 Mon Sep 17 00:00:00 2001 From: frennkie Date: Sat, 5 Sep 2020 23:59:02 +0200 Subject: [PATCH 04/12] Update README.md Update Bitcoin v0.20.1 in readme.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1b0b87f7..56bb63ce9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ *Build your own Lightning Node on a RaspberryPi with a nice Display.* -`Version 1.6 with lnd 0.10.4 and bitcoin 0.20.0 (or litecoin 0.18.1)` +`Version 1.6 with lnd 0.10.4 and bitcoin 0.20.1 (or litecoin 0.18.1)` ![RaspiBlitz](pictures/raspiblitz.jpg) From 49dc6f78cebf6711a3e2ec9a266fdc3358708f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20K?= <36115705+rene78@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:49:11 +0200 Subject: [PATCH 05/12] Update README.md Some corrections got lost on the merge. Tried to implement them again. Current Blockchain size is 300GB, not 350 - corrected my mistake. Update instructions for versions <1.0 were missing. Added it back. --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d1b0b87f7..6363200ee 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,7 @@ With the new RaspberryPi 4 (with SSD & min 2GB RAM) this is the best way to go. #### 2. COPY - Copy from Laptop or another RaspiBlitz over Local Network -First you need to download & validate the blockchain on your own computer/laptop. Todo so install bitcoin-core (0.18.1 or higher) from [bitcoin.org](https://bitcoin.org/en/download) and keep it running until blockchain is synced (will need around 350 GB). +First you need to download & validate the blockchain on your own computer/laptop. Todo so install bitcoin-core (0.18.1 or higher) from [bitcoin.org](https://bitcoin.org/en/download) and keep it running until blockchain is synced (will need around 300 GB). Then you can use the COPY option to copy the blockchain over to the RaspiBlitz. This will be done over the local network by SCP (SSH file transfer) - follow the instructions given during the dialog. @@ -308,7 +308,7 @@ The RaspiBlitz calling the LND wallet creation command for you: ##### LNDRESCUE LND tar.gz-Backupfile (BEST) -Choose this option if you have made a complete backup of the LND data and have a tar.gz file starting with the word 'lnd-rescue' available. It will recover all your on-chain funds and open channels you had. But you have to be sure, that the LND backup you have is really the latest version - otherwise you might loose channel funds. +Choose this option if you have made a complete backup of the LND data and have a tar.gz file starting with the word 'lnd-rescue' available. It will recover all your on-chain funds and open channels you had. But you have to make sure that the LND backup you have is really the latest version - otherwise you might lose channel funds. *If you have tar.gz file that starts with 'raspiblitz', that's a migration file. That also includes your old LND wallet, but you import it earlier in the setup process .. see further below for details.* @@ -466,7 +466,7 @@ Use if you want to remove all funds from the RaspiBlitz. #### lnfwdreport: Report on your earned fees for Forwarding Payments -If you connected your node well within the Lightning Network you can become a "Routing Node" other users might select your Node as part of a Lightnig Payment and will pay you the fee you set on those channels. This menu point gives you a detailed report over the amount of days you set. +If you connected your node well within the Lightning Network you can become a "Routing Node". Other users might select your Node as part of a Lightning Payment and will pay you the fee you set on those channels. This menu point gives you a detailed report over the amount of days you set. Beware - earning fees as a routing node does not come automatic. It's a bit of hard work of building the right channels to be attractive for other people to route thru. Check the internet for tutorials or use tools like "lndmanage" (see under RaspiBlitz SERVICES) to help you analyse and optimize your channel management. @@ -713,7 +713,7 @@ At the moment, the following subscription services are available: ##### IP2TOR (paid) -IP2TOR is a tunnel service where you can run your RaspiBlitz anonymously behind TOR but you rent a port on a clearnet IP thru which you can make services of your RaspiBlitz easy reachable for everybody on the internet. You dont need to care about your local router or firewall settings. You can pay this service also directly thru Lightning from your RaspiBlitz as subscription. +IP2TOR is a tunnel service where you can run your RaspiBlitz anonymously behind TOR but you rent a port on a clearnet IP thru which you can make services of your RaspiBlitz easy reachable for everybody on the internet. You don't need to care about your local router or firewall settings. You can pay this service also directly thru Lightning from your RaspiBlitz as subscription. At first you select what service of your RaspiBlitz you like to tunnel thru a IP2TOR bridge. @@ -878,11 +878,11 @@ This is common way to update your RaspiBlitz. Choose this option to prepare your Sometimes there is a new LND release that has some breaking changes that once you updated the LND database cannot be reversed (like the update from 0.9.2 to 0.10.0). Then RaspiBlitz offers you an optional update ... this is where you then can update LND. -If you choose this you get the option to do this `VERIFIED` that means it offers you the optional LND update we tested the RaspiBlitz with or `RECKLESS` which will just grab the latest LND release from the GitHub releases page (also Release Candidates) and install it with no further garantees and verification checks - this is for people that run nodes to test new releases and how they work with existing RaspiBlitz apps. +If you choose this you get the option to do this `VERIFIED` that means it offers you the optional LND update we tested the RaspiBlitz with or `RECKLESS` which will just grab the latest LND release from the GitHub releases page (also Release Candidates) and install it with no further guarantees and verification checks - this is for people that run nodes to test new releases and how they work with existing RaspiBlitz apps. #### PATCH: Patch RaspiBlitz code -With Patching you have now an easy way to sync your RaspiBlitz code/scripts with the official RaspiBlitz GitHub Repo or even your own forked GitHUb Repo. This is an option for people that report bugs and we like to offer them a quick script update (patch) between RaspiBlitz releases or for people who want to develolp on the RaspiBlitz and sync code between their IDE, forked GitHub and their RaspiBlitz. +With Patching you have now an easy way to sync your RaspiBlitz code/scripts with the official RaspiBlitz GitHub Repo or even your own forked GitHub Repo. This is an option for people that report bugs and we like to offer them a quick script update (patch) between RaspiBlitz releases or for people who want to develolp on the RaspiBlitz and sync code between their IDE, forked GitHub and their RaspiBlitz. #### REBOOT: Reboot RaspiBlitz @@ -1009,6 +1009,8 @@ To test it, try opening or closing a channel, and then check if you can find a c ## Updating RaspiBlitz to new Version +If you have a RaspiBlitz older than version v1.0, please [see here](FAQ.md). + If you have a RaspiBlitz v1.2 or higher - just follow the `UPDATE` option from the main menu (choose `RELEASE` if asked) and follow the instructions. If you have a RaspiBlitz v1.0 or v1.1 or higher do the following: From 5fa400e4c55ffe0b47eb5a8e8261955e7692446f Mon Sep 17 00:00:00 2001 From: frennkie Date: Mon, 7 Sep 2020 12:07:39 +0200 Subject: [PATCH 06/12] Update _bootstrap.sh --- home.admin/_bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index bd3f4bf3f..b5cb1dfd8 100644 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -595,7 +595,7 @@ sed -i "s/^message=.*/message='waiting login'/g" ${infoFile} loaded=$(sudo systemctl status bitcoind | grep -c 'loaded') if [ ${loaded} -gt 0 ]; then sed -i "s/^network=.*/network=bitcoin/g" ${infoFile} - source /mnt/hdd/bitcoin/bitcoin.conf + source /mnt/hdd/bitcoin/bitcoin.conf >/dev/null 2>&1 if [ ${testnet} -gt 0 ]; then sed -i "s/^chain=.*/chain=test/g" ${infoFile} else From 1f8c11961315b30d617dd8d9c101d83911551845 Mon Sep 17 00:00:00 2001 From: frennkie Date: Mon, 7 Sep 2020 12:16:12 +0200 Subject: [PATCH 07/12] Update bonus.faraday.sh fix unix file permissions on faraday.service (should be 0644) --- home.admin/config.scripts/bonus.faraday.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home.admin/config.scripts/bonus.faraday.sh b/home.admin/config.scripts/bonus.faraday.sh index d1bc0d5f8..3126ed71d 100755 --- a/home.admin/config.scripts/bonus.faraday.sh +++ b/home.admin/config.scripts/bonus.faraday.sh @@ -194,8 +194,7 @@ StandardError=journal WantedBy=multi-user.target EOF - sudo mv /mnt/hdd/temp/faraday.service /etc/systemd/system/faraday.service - sudo chown root:root /etc/systemd/system/faraday.service + sudo install -m 0644 -o root -g root -t /etc/systemd/system /mnt/hdd/temp/faraday.service sudo systemctl enable faraday if [ "${state}" == "ready" ]; then sudo systemctl start faraday From 4f597627b8a5f76deaa27c598268cfcefc4a2372 Mon Sep 17 00:00:00 2001 From: frennkie Date: Mon, 7 Sep 2020 12:25:56 +0200 Subject: [PATCH 08/12] Update bonus.btc-rpc-explorer.sh Fix warning: `/etc/systemd/system/./btc-rpc-explorer.service:10: Unknown lvalue 'StartLimitIntervalSec' in section 'Service', ignoring` --- home.admin/config.scripts/bonus.btc-rpc-explorer.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh index bd0b772d3..57ae036e8 100644 --- a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh +++ b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh @@ -203,10 +203,9 @@ After=${network}d.service WorkingDirectory=/home/btcrpcexplorer/btc-rpc-explorer ExecStart=/usr/bin/npm start User=btcrpcexplorer -# Restart on failure but no more than 2 time every 10 minutes (600 seconds). Otherwise stop +# Restart on failure but no more than default times (DefaultStartLimitBurst=5) every 10 minutes (600 seconds). Otherwise stop Restart=on-failure -StartLimitIntervalSec=600 -StartLimitBurst=2 +RestartSec=600 [Install] WantedBy=multi-user.target From 591ef011937151e51cfcf0898720ff287a44ed4a Mon Sep 17 00:00:00 2001 From: frennkie Date: Mon, 7 Sep 2020 17:26:07 +0200 Subject: [PATCH 09/12] Update bonus.faraday.sh --- home.admin/config.scripts/bonus.faraday.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/home.admin/config.scripts/bonus.faraday.sh b/home.admin/config.scripts/bonus.faraday.sh index 3126ed71d..bacfa9b06 100755 --- a/home.admin/config.scripts/bonus.faraday.sh +++ b/home.admin/config.scripts/bonus.faraday.sh @@ -195,6 +195,7 @@ WantedBy=multi-user.target EOF sudo install -m 0644 -o root -g root -t /etc/systemd/system /mnt/hdd/temp/faraday.service + sudo rm -rf /mnt/hdd/temp/faraday.service sudo systemctl enable faraday if [ "${state}" == "ready" ]; then sudo systemctl start faraday From 4fa7d4c03ca65183a198dfb1cb39f7af2114f079 Mon Sep 17 00:00:00 2001 From: frennkie Date: Tue, 8 Sep 2020 21:09:23 +0200 Subject: [PATCH 10/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fa2f28a5..26a1a3ef2 100644 --- a/README.md +++ b/README.md @@ -1038,7 +1038,7 @@ A ready-to-use SD card image of RaspiBlitz is provided by us for download, to ge Now you are ready to start the SD card build script (check the code to see if the installation and config are OK for you). Copy the following command into your terminal and execute: -`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/master/build_sdcard.sh && sudo bash build_sdcard.sh` +`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/v1.6/build_sdcard.sh && sudo bash build_sdcard.sh` As you can see from the URL, you can find the build script in this Git repo under `build_sdcard.sh`. You can check what gets installed and configured in detail. Feel free to post improvements as pull requests. From 5d2144448a73ba61b8ea9af2073f80b387710e9d Mon Sep 17 00:00:00 2001 From: frennkie Date: Tue, 8 Sep 2020 21:10:57 +0200 Subject: [PATCH 11/12] Update FAQ.md --- FAQ.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FAQ.md b/FAQ.md index 10acdb96e..5010e4b05 100644 --- a/FAQ.md +++ b/FAQ.md @@ -10,7 +10,7 @@ The update should be quite simple - you don't need to close any channels: - Best is to get a second 16GB or 32GB sd card - but you can also reuse your old one - In SSH main menu of you RaspiBlitz choose `UPDATE` & follow the dialogs until shutdown -- Download the new RaspiBlitz image file from the [GitHub README](https://github.com/rootzoll/raspiblitz/blob/master/README.md#installing-the-software) +- Download the new RaspiBlitz image file from the [GitHub README](https://github.com/rootzoll/raspiblitz/blob/dev/README.md#installing-the-software) - Write the new image to the (new) sd card with a tool like [balena etcher](https://www.balena.io/etcher/) - RaspiBlitz with new sd card image - it now goes through a recover/update phase - this may take some time. - Once that's done, login once per SSH and use the password raspiblitz and set a new password A (can be your old one or a new one). From 26308d75d59a7d1706f1d952155603f72a0dcd7b Mon Sep 17 00:00:00 2001 From: Robert Habermann Date: Tue, 8 Sep 2020 21:19:38 +0200 Subject: [PATCH 12/12] replace links to master with v1.6 or dev path --- alternative.platforms/README.md | 2 +- alternative.platforms/dietpi/Odroid_HC1_XU4.md | 14 +++++++------- alternative.platforms/dietpi/README.md | 2 +- alternative.platforms/dietpi/RaspberryPi.md | 10 +++++----- .../dietpi/boot/Automation_Custom_Script.sh | 4 ++-- alternative.platforms/display.alternatives.sh | 2 +- home.admin/XXsyncScripts.sh | 2 +- home.admin/config.scripts/internet.sshtunnel.py | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/alternative.platforms/README.md b/alternative.platforms/README.md index ed4c1a38b..d8c47deee 100644 --- a/alternative.platforms/README.md +++ b/alternative.platforms/README.md @@ -93,7 +93,7 @@ Detailed instructions for the RaspiBlitz-on-DietPi: [alternative.platforms/dietp --- For the process to build a custom SDcard image release see: -https://github.com/rootzoll/raspiblitz/blob/master/FAQ.md#what-is-the-process-of-creating-a-new-sd-card-image-release +https://github.com/rootzoll/raspiblitz/blob/dev/FAQ.md#what-is-the-process-of-creating-a-new-sd-card-image-release Extras for advanced users and powerful hardware: https://github.com/openoms/bitcoin-tutorials/ \ No newline at end of file diff --git a/alternative.platforms/dietpi/Odroid_HC1_XU4.md b/alternative.platforms/dietpi/Odroid_HC1_XU4.md index a58ef3fc1..b0c485abb 100644 --- a/alternative.platforms/dietpi/Odroid_HC1_XU4.md +++ b/alternative.platforms/dietpi/Odroid_HC1_XU4.md @@ -25,7 +25,7 @@ password: `raspiblitz` Using this image you can skip the rest of this page. -The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/master/README.md#setup-process-detailed-documentation) +The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/dev/README.md#setup-process-detailed-documentation) --- ### The automated building process: @@ -34,13 +34,13 @@ The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootz https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Stretch.7z 2) Burn it to the SD card with [Etcher](https://www.balena.io/etcher/) -3) Right click and download the following two files: [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt), [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh) +3) Right click and download the following two files: [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt), [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh) 4) Copy them to the /boot directory of the DietPi SDcard - [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt): Overwrites the default dietpi.txt. Modified the settings to automate the DietPi setup. (see the details [here](https://github.com/rootzoll/raspiblitz/tree/master/alternative.platforms/dietpi#excerpts-from-the-customized-dietpitxt)) + [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt): Overwrites the default dietpi.txt. Modified the settings to automate the DietPi setup. (see the details [here](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms/dietpi#excerpts-from-the-customized-dietpitxt)) - [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh): Runs after DietPi installation is completed. Contains the link to download and run the build_sdcard.sh from the dev branch of @rootzoll. + [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh): Runs after DietPi installation is completed. Contains the link to download and run the build_sdcard.sh from the dev branch of @rootzoll. (Optionally open the file with a text editor and uncomment (remove the `#` from the front of) the line with the branch you want to build the SDcard from.) 5) Assemble and boot the Odroid @@ -65,7 +65,7 @@ https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Stretch.7z `ssh admin@[IP-OF-RASPIBLITZ]` password: `raspiblitz` - The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/master/README.md#setup-process-detailed-documentation) + The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/dev/README.md#setup-process-detailed-documentation) --- @@ -134,7 +134,7 @@ Changing the SSH server will change the SSH keys again. To clear: ### Run the RaspiBlitz build_sdcard.sh script * Run this command to build from the master branch of @rootzoll: -`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/master/build_sdcard.sh && sudo bash build_sdcard.sh` +`wget https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/build_sdcard.sh && sudo bash build_sdcard.sh` This will take a couple minutes depending on your internet ceonnection and the processing power of the SBC. * Format of the command to build the SDcard from an alternative branch: @@ -145,7 +145,7 @@ If you are working from a forked repo be aware of that the fork needs to be call `ssh admin@[IP-OF-DROIDBLITZ]` password: `raspiblitz` -* From here he setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/master/README.md#setup-process-detailed-documentation) +* From here he setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/dev/README.md#setup-process-detailed-documentation) --- ### Examples of copying the blockchain data from a HDD using a powered USB to SATA adapter diff --git a/alternative.platforms/dietpi/README.md b/alternative.platforms/dietpi/README.md index 1b41ae88e..e250b154e 100644 --- a/alternative.platforms/dietpi/README.md +++ b/alternative.platforms/dietpi/README.md @@ -72,7 +72,7 @@ If you are working from a forked repo be aware of that the fork needs to be call `ssh admin@[IP-OF-RASPIBLITZ]` password: `raspiblitz` -* From here he setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/master/README.md#setup-process-detailed-documentation) +* From here he setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/dev/README.md#setup-process-detailed-documentation) --- ### Useful commands for debugging: diff --git a/alternative.platforms/dietpi/RaspberryPi.md b/alternative.platforms/dietpi/RaspberryPi.md index 4aa681cd5..d873609bc 100644 --- a/alternative.platforms/dietpi/RaspberryPi.md +++ b/alternative.platforms/dietpi/RaspberryPi.md @@ -8,13 +8,13 @@ https://dietpi.com/downloads/images/DietPi_RPi-ARMv6-Stretch.7z 2) Burn it to the SD card with [Etcher](https://www.balena.io/etcher/) -3) Right click and download the following two files: [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt), [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh) +3) Right click and download the following two files: [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt), [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh) 4) Copy them to the /boot directory of the DietPi SDcard - [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt): Overwrites the default dietpi.txt. Modified the settings to automate the DietPi setup. (see the details [here](https://github.com/rootzoll/raspiblitz/tree/master/alternative.platforms/dietpi#excerpts-from-the-customized-dietpitxt)) + [DietPi.txt](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/dietpi.txt): Overwrites the default dietpi.txt. Modified the settings to automate the DietPi setup. (see the details [here](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms/dietpi#excerpts-from-the-customized-dietpitxt)) - [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh): Runs after DietPi installation is completed. Contains the link to download and run the build_sdcard.sh from the dev branch of @rootzoll. + [Automation_Custom_Script.sh](https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh): Runs after DietPi installation is completed. Contains the link to download and run the build_sdcard.sh from the dev branch of @rootzoll. (Optionally open the file with a text editor and uncomment (remove the `#` from the front of) the line with the branch you want to build the SDcard from.) 5) Assemble and boot the Raspberry Pi @@ -33,8 +33,8 @@ https://dietpi.com/downloads/images/DietPi_RPi-ARMv6-Stretch.7z `ssh admin@[IP-OF-RASPIBLITZ]` password: `raspiblitz` - The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/master/README.md#setup-process-detailed-documentation) + The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootzoll/raspiblitz/blob/dev/README.md#setup-process-detailed-documentation) --- ### To build manually: -[Follow the generic DietPi install process.](https://github.com/rootzoll/raspiblitz/tree/master/alternative.platforms/dietpi#general-guide-for-the-raspiblitz-on-dietpi) +[Follow the generic DietPi install process.](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms/dietpi#general-guide-for-the-raspiblitz-on-dietpi) diff --git a/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh b/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh index 61912e8b3..4879cdfe2 100644 --- a/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh +++ b/alternative.platforms/dietpi/boot/Automation_Custom_Script.sh @@ -4,8 +4,8 @@ # Uncomment the line with the branch you want to build the SDcard from: -# @rootzoll master branch: -wget https://raw.githubusercontent.com/rootzoll/raspiblitz/master/build_sdcard.sh && sudo bash build_sdcard.sh +# @rootzoll v1.6 release branch: +wget https://raw.githubusercontent.com/rootzoll/raspiblitz/v1.6/build_sdcard.sh && sudo bash build_sdcard.sh # @rootzoll dev branch: # wget https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/build_sdcard.sh && sudo bash build_sdcard.sh dev diff --git a/alternative.platforms/display.alternatives.sh b/alternative.platforms/display.alternatives.sh index 474df8c4e..6081a999c 100644 --- a/alternative.platforms/display.alternatives.sh +++ b/alternative.platforms/display.alternatives.sh @@ -1,5 +1,5 @@ # To run this script on your RaspiBlitz, copy the following line to the ssh terminal (after the #): -# wget https://raw.githubusercontent.com/rootzoll/raspiblitz/master/alternative.platforms/display.alternatives.sh && sudo bash display.alternatives.sh +# wget https://raw.githubusercontent.com/rootzoll/raspiblitz/dev/alternative.platforms/display.alternatives.sh && sudo bash display.alternatives.sh echo "Detect Base Image ..." baseImage="?" diff --git a/home.admin/XXsyncScripts.sh b/home.admin/XXsyncScripts.sh index cecaa0709..74827b4ee 100755 --- a/home.admin/XXsyncScripts.sh +++ b/home.admin/XXsyncScripts.sh @@ -4,7 +4,7 @@ # THIS IS NOT THE REGULAR UPDATE MECHANISM # and can lead to dirty state of your scripts. # IF YOU WANT TO UPDATE YOUR RASPIBLITZ: -# https://github.com/rootzoll/raspiblitz/blob/master/FAQ.md#how-to-update-my-raspiblitz-after-version-098 +# https://github.com/rootzoll/raspiblitz/blob/dev/FAQ.md#how-to-update-my-raspiblitz-after-version-098 # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "-help" ]; then diff --git a/home.admin/config.scripts/internet.sshtunnel.py b/home.admin/config.scripts/internet.sshtunnel.py index 007b6735d..52ecdc5ee 100755 --- a/home.admin/config.scripts/internet.sshtunnel.py +++ b/home.admin/config.scripts/internet.sshtunnel.py @@ -218,7 +218,7 @@ def on(restore_on_update=False): print("*** WIN - SSH TUNNEL SERVICE SETUP ***") print("**************************************") print("See chapter 'How to setup port-forwarding with a SSH tunnel?' in:") - print("https://github.com/rootzoll/raspiblitz/blob/master/FAQ.md") + print("https://github.com/rootzoll/raspiblitz/blob/dev/FAQ.md") print("- Tunnel service needs final reboot to start.") print("- After reboot check logs: sudo journalctl -f -u {}".format(SERVICE_NAME)) print("- Make sure the SSH pub key of this RaspiBlitz is in 'authorized_keys' of {}:".format(ssh_server_host))