mirror of
https://github.com/rootzoll/raspiblitz.git
synced 2024-11-19 09:50:19 +01:00
Merge branch 'dev' of https://github.com/rootzoll/raspiblitz into dev
This commit is contained in:
rootzoll
commit
9d8f230102
@ -15,9 +15,9 @@
|
||||
- Update: Bitcoin Core v22.0 [details](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-22.0.md)
|
||||
- Update: LND v0.13.1 [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.13.1-beta)
|
||||
- Update: Specter Desktop 1.6.0 [details](https://github.com/cryptoadvance/specter-desktop/blob/master/README.md)
|
||||
- Update: JoinMarket v0.9.1 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/#joinmarket-clientserver)
|
||||
- Update: JoininBox v0.6.0 [details](https://github.com/openoms/joininbox/tree/master#joininbox)
|
||||
- Update: Electrum Server in Rust (electrs) v0.8.12 [details](https://github.com/romanz/electrs/blob/v0.8.12/RELEASE-NOTES.md)
|
||||
- Update: JoinMarket v0.9.2 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.2)
|
||||
- Update: JoininBox v0.6.1 [details](https://github.com/openoms/joininbox/releases/tag/v0.6.1)
|
||||
- Update: Electrum Server in Rust (electrs) v0.9.0 [details](https://github.com/romanz/electrs/blob/v0.9.0/RELEASE-NOTES.md)
|
||||
- Update: Mempool 2.2.2 [details](https://github.com/mempool/mempool)
|
||||
- Update: BTC-RPC-Explorer v3.2.0 [details](https://github.com/janoside/btc-rpc-explorer/blob/master/CHANGELOG.md#v320)
|
||||
- Update: stacking-sats-kraken 0.4.4 [details](https://github.com/dennisreimann/stacking-sats-kraken/blob/master/README.md)
|
||||
|
||||
@ -113,11 +113,10 @@ In the end your RaspiBlitz should look like this:
|
||||
|Philosophy|Trust|Sovereignty|
|
||||
|Difficulty level|Easy|Medium|
|
||||
|Pros|Make Blitz accessible to everyone|You don't need to trust us, build from your own forked repository|
|
||||
|Cons|You have to trust the mantainer image binaries|You need to read the build_sdcard.sh parameters in order for the customization to suit your needs|
|
||||
|Instructions|[Download 1.7.1RC2 image](https://raspiblitz.fulmo.org/images/raspiblitz-v1.7.1rc2-2021-09-23.img.gz) and [Flash the sd card](README.md#write-the-sd-card-image-to-your-sd-card)|[Build your own sd card image](#build-the-sd-card-image)|
|
||||
|Verify what?|[Signature file - only for final release]() and [verify the Sig](FAQ.md#how-to-verify-the-sd-card-image-after-download) OR SHA-256 (below)|All of the code, don't trust, verify|
|
||||
|
||||
If downloading the mantainer sd card image:
|
||||
If downloading the maintainer sd card image:
|
||||
* GPG 64-bit: 1C73 060C 7C17 6461
|
||||
* SHA-256: 4c857203c927951248a15b71d3c3a64e34b033f7c55674ab8dacdcab7e38f778
|
||||
|
||||
@ -125,7 +124,7 @@ Which verification method should I used: Hash or Signature?
|
||||
* Signed file prove to you that the SD card image was actually built by the lead developer of the RaspiBlitz project. (Safest)
|
||||
* Hash function checks file integrity. (Secure)
|
||||
|
||||
The mantainer sd card image can also be downloaded via torrent:
|
||||
The maintainer sd card image can also be downloaded via torrent:
|
||||
* [assets/raspiblitz-vXXX.img.gz.torrent](https://github.com/rootzoll/raspiblitz/raw/v1.7/home.admin/assets/raspiblitz-XXX.img.gz.torrent)
|
||||
|
||||
Useful info:
|
||||
@ -520,7 +519,7 @@ Keysend is a feature of LND that allows your node to accept payments without hav
|
||||
|
||||
##### LND Circuitbreaker (Firewall for LND)
|
||||
|
||||
Not everybody is acting friendly in the Lightning network. Circuitbreaker is a background service you cann activate that acts similar to a firewall to protect your now better. For details see: https://github.com/lightningequipment/circuitbreaker/blob/master/README.md
|
||||
Not everybody is acting friendly in the Lightning network. Circuitbreaker is a background service you can activate that acts similar to a firewall to protect your now better. For details see: https://github.com/lightningequipment/circuitbreaker/blob/master/README.md
|
||||
|
||||
##### LND Auto-Unlock
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
|
||||
# ⚡️ RaspiBlitz-on-DietPi ⚡️
|
||||
# For the Odroid HC1 / HC2 / XU3 / XU4
|
||||
# For the Odroid HC1 / HC2 / XU3 / XU4 / MC1
|
||||
|
||||
|
||||
|
||||
## There are 3 options provided:
|
||||
* a trusted fully prebuilt SDcard image
|
||||
* Automated building process.
|
||||
* Build your own SDcard from the image downloaded from [Dietpi.com](dietpi.com#download)
|
||||
* Build your own SDcard from the image downloaded from [dietpi.com](https://dietpi.com/#download)
|
||||
---
|
||||
### Download the fully prebuilt RaspiBlitz-on-DietPi SDcard image
|
||||
|
||||
@ -30,15 +30,15 @@ The setup continues with the [RaspiBlitz Setup Process](https://github.com/rootz
|
||||
---
|
||||
### The automated building process:
|
||||
|
||||
1) Download the DietPi image for the Odroid HC1 / HC2 / XU3 / XU4:
|
||||
https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Stretch.7z
|
||||
1) Download the DietPi image for the Odroid HC1 / HC2 / XU3 / XU4 / MC1:
|
||||
https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Buster.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/dev/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/dev/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/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.)
|
||||
@ -53,14 +53,6 @@ https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Stretch.7z
|
||||
`tail -n1000 -f /tmp/DietPi-Update/dietpi-update.log` - follow the dietpi-update process
|
||||
`tail -n1000 -f /var/tmp/dietpi/logs/dietpi-automation_custom_script.log` follow the output of the build_sdcard.sh
|
||||
|
||||
Starting from a v6.14 DietPi image is causing a bootloop after the first restart. See the issue: https://github.com/MichaIng/DietPi/issues/2495. This will be sorted out once a new image version is uploaded for the Odroids to dietpi.com.
|
||||
To get past it:
|
||||
* Log in with root after the first restart (when the loop is ongoing - without any output to the HDMI screen)
|
||||
* CTRL+C, run `dietpi-update` and update
|
||||
* `reboot` once finished
|
||||
* from then the Automation_Custom_Script.sh is carrying on
|
||||
|
||||
|
||||
6) When the setup is finished log in as `admin`:
|
||||
`ssh admin@[IP-OF-RASPIBLITZ]`
|
||||
password: `raspiblitz`
|
||||
@ -71,12 +63,8 @@ password: `raspiblitz`
|
||||
|
||||
### Build your own DietPi image:
|
||||
|
||||
Watch out this is an arduous process.
|
||||
Updating from a v6.14 DietPi image is causing a bootloop after the first restart. See the issue: https://github.com/MichaIng/DietPi/issues/2495.
|
||||
This will be sorted out once a new image version is uploaded for the Odroids to dietpi.com
|
||||
|
||||
* For the Odroid HC1 / HC2 / XU3 / XU4 the start is this image:
|
||||
https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Stretch.7z
|
||||
* For the Odroid HC1 / HC2 / XU3 / XU4 / MC1 the start is this image:
|
||||
https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Buster.7z
|
||||
* Burn it to the SD with [Etcher](https://www.balena.io/etcher/)
|
||||
|
||||
* Insert the SD card, connect the HDD, the network cable and power supply to boot up the Odroid:
|
||||
@ -84,50 +72,19 @@ https://dietpi.com/downloads/images/DietPi_OdroidXU4-ARMv7-Stretch.7z
|
||||
* In the desktop terminal on Linux / MacOS or Putty on Windows:
|
||||
`ssh root@[IP-OF-DIETPI]`
|
||||
password: `dietpi`
|
||||
Getting started with DietPi: https://dietpi.com/phpbb/viewtopic.php?f=8&t=9#p9
|
||||
Getting started with DietPi: https://dietpi.com/docs/install/#4-first-logon-on-dietpi
|
||||
|
||||
* Ok > Cancel > Cancel
|
||||
automatic apt update & apt upgrade and asks to reboot
|
||||
|
||||
|
||||
* Log back in:
|
||||
`ssh root@[IP-OF-DIETPI]`
|
||||
password: `dietpi`
|
||||
* after the update the ssh keys might change:
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
run (can be copied from the terminal output):
|
||||
`ssh-keygen -f "/home/[your-linux-username]/.ssh/known_hosts" -R "dietpi.IP"`
|
||||
`ssh root@[IP-OF-DIETPI]`
|
||||
yes >
|
||||
password: `dietpi`
|
||||
|
||||
* At this point if the DietPi OS was not updated from 6.14 it does not manage to save settings going forward.
|
||||
Exit the software installer (press Tab to jump to Exit)
|
||||
|
||||
|
||||
* in the bash prompt run:
|
||||
`dietpi-update`
|
||||
Ok > Cancel the recovery point
|
||||
update > Opt out of survey > Ok
|
||||
Reboots
|
||||
|
||||
* Log back in:
|
||||
`ssh root@[IP-OF-DIETPI]`
|
||||
password: `dietpi`
|
||||
* In the DietPi software menu install fail2ban and make OpenSSH server the default SSH server.
|
||||
Ok > Cancel > Cancel
|
||||
Search `fail2ban` > Space to select > Enter
|
||||
SSH server > switch from Dropbear to the OpenSSH-server
|
||||
Install > Ok
|
||||
Opt out of survey > Ok
|
||||
Reboots again
|
||||
|
||||
* Log back in:
|
||||
`ssh root@[IP-OF-DIETPI]`
|
||||
password: `dietpi`
|
||||
Changing the SSH server will change the SSH keys again. To clear:
|
||||
Changing the SSH server will change the SSH keys. To clear:
|
||||
`ssh-keygen -f "/home/[your-linux-username]/.ssh/known_hosts" -R "dietpi.IP"`
|
||||
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ fi
|
||||
if [ "${lightning}" == "cl" ] || [ "${cl}" == "on" ]; then
|
||||
OPTIONS+=(c 'C-Lightning RTL Webinterface' ${crtlWebinterface})
|
||||
OPTIONS+=(k 'C-Lightning Sparko WebWallet' ${sparko})
|
||||
OPTIONS+=(m 'C-Lightning Spark Wallet' ${spark})
|
||||
OPTIONS+=(n 'C-Lightning Spark Wallet' ${spark})
|
||||
fi
|
||||
|
||||
CHOICES=$(dialog --title ' Additional Mainnet Services ' \
|
||||
@ -499,7 +499,7 @@ else
|
||||
fi
|
||||
|
||||
# spark wallet process choice
|
||||
choice="off"; check=$(echo "${CHOICES}" | grep -c "m")
|
||||
choice="off"; check=$(echo "${CHOICES}" | grep -c "n")
|
||||
if [ ${check} -eq 1 ]; then choice="on"; fi
|
||||
if [ "${spark}" != "${choice}" ]; then
|
||||
echo "# Spark Wallet on mainnet Setting changed .."
|
||||
|
||||
@ -64,7 +64,7 @@ After=network.target
|
||||
WorkingDirectory=/home/admin/blitz_api
|
||||
# before every start update the config with latest credentials/settings
|
||||
ExecStartPre=-/home/admin/config.scripts/blitz.web.api.sh update-config
|
||||
ExecStart=sudo -u admin /usr/bin/python -m uvicorn main:app --reload --port 11111 --host=0.0.0.0 --root-path /api
|
||||
ExecStart=sudo -u admin /usr/bin/python -m uvicorn app.main:app --port 11111 --host=0.0.0.0 --root-path /api
|
||||
User=root
|
||||
Group=root
|
||||
Type=simple
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# https://github.com/openoms/bitcoin-tutorials/tree/master/joinmarket
|
||||
# https://github.com/openoms/joininbox
|
||||
|
||||
JBVERSION="v0.6.0"
|
||||
JBVERSION="v0.6.1" # with JoinMarket v0.9.2
|
||||
PGPsigner="openoms"
|
||||
PGPpkeys="https://keybase.io/oms/pgp_keys.asc"
|
||||
PGPcheck="13C688DB5B9C745DE4D2E4545BFB77609B081B65"
|
||||
|
||||
@ -246,7 +246,7 @@ EOF
|
||||
# ACTIVATE APPS OVER TOR
|
||||
source /mnt/hdd/raspiblitz.conf 2>/dev/null
|
||||
if [ "${BTCRPCexplorer}" = "on" ]; then
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh btc-rpc-explorer 80 3002
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh btc-rpc-explorer 80 3022 443 3023
|
||||
fi
|
||||
if [ "${rtlWebinterface}" = "on" ]; then
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh RTL 80 3002 443 3003
|
||||
|
||||
Loading…
Reference in New Issue
Block a user