From dd84df171f471983403a9d73e9ea8f2518d5a6de Mon Sep 17 00:00:00 2001 From: BWD <114258829+BuildWithData@users.noreply.github.com> Date: Wed, 18 Oct 2023 00:02:54 +0200 Subject: [PATCH] Update to Debian 12 (#47) * create log folder and then force wget option -o * roll back to bitcoin version to 23 * typo * append logs to tmp file and then append back to main log file * patch linode script * ReadMe --------- Co-authored-by: BuildWithData <@Buildwd> --- README.md | 6 +++--- Scripts/LinodeStandUp.sh | 14 ++++++++++---- Scripts/StandUp.sh | 14 ++++++++++---- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 58a551c..ede4bc8 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ The *Bitcoin-Standup-Scripts* are updated every year or two for the newest versi There are two linux based StandUp scripts; `StandUp.sh` and `LinodeStandUp.sh`. -* `LinodeStandUp.sh` is built as a StackScript for the Linode platform and can be used as is. It's been tested on Debian 11 (Bullseye), with previous versions tested on Debian 9 (Stretch) and Debian 10 (Buster). -* `StandUp.sh` can be used on a Debian VPS and has been tested on Debian 11 (Bullseye), with previous versions tested on Debian 9 (Stretch) and Ubuntu 18.04. +* `LinodeStandUp.sh` is built as a StackScript for the Linode platform and can be used as is. It's been tested on Debian 12 (Bookworm), with previous versions tested on Debian 9 (Stretch), Debian 10 (Buster) and Debian 11 (Bullseye). +* `StandUp.sh` can be used on a Debian VPS and has been tested on Debian 12 (Bookworm), with previous versions tested on Debian 9 (Stretch), Debian 11 (Bullseye) and Ubuntu 18.04. You will use different installation methods depending on which script you use (or if you want to run the installation entirely by hand) @@ -70,7 +70,7 @@ First, copy the `LinodeStandup.sh` script to your Linode: 1. Copy the complete [LinodeStandup.sh script](https://github.com/BlockchainCommons/Bitcoin-Standup-Scripts/blob/master/Scripts/LinodeStandUp.sh). 2. Go to the [Stackscripts page](https://cloud.linode.com/stackscripts?type=account) on your Linode account; choose [Create New Stackscript](https://cloud.linode.com/stackscripts/create) 3. Paste `LinodeStandup.sh` into the "Script" area. Make sure you got it all, from the "#!/bin/bash" to the "exit 1"! -4. Choose "Debian 11" (Bullseye) for the "Target Images". +4. Choose "Debian 12" (Bookworm) for the "Target Images". 5. Click "Save". Second, create a node based on the script: diff --git a/Scripts/LinodeStandUp.sh b/Scripts/LinodeStandUp.sh index 728f550..c583f2a 100644 --- a/Scripts/LinodeStandUp.sh +++ b/Scripts/LinodeStandUp.sh @@ -267,13 +267,19 @@ echo "$0 - Downloading Bitcoin; this will also take a while!" export BITCOINPLAIN=`echo $BITCOIN | sed 's/bitcoin-core/bitcoin/'` -sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -O ~standup/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~standup/SHA256SUMS.asc -sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS +sudo -u standup mkdir ~standup/.logs -sudo -u standup wget https://raw.githubusercontent.com/bitcoin/bitcoin/23.x/contrib/builder-keys/keys.txt -O ~standup/keys.txt +sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -O ~standup/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -a ~standup/.logs/wget +sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~standup/SHA256SUMS.asc -a ~standup/.logs/wget +sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS -a ~standup/.logs/wget + +sudo -u standup wget https://raw.githubusercontent.com/bitcoin/bitcoin/23.x/contrib/builder-keys/keys.txt -O ~standup/keys.txt -a ~standup/.logs/wget sudo -u standup sh -c 'while read fingerprint keyholder_name; do gpg --keyserver hkps://keys.openpgp.org --recv-keys ${fingerprint}; done < ~standup/keys.txt' +cat ~standup/.logs/wget >> /standup.log +cat ~standup/.logs/wget >> /standup.err +rm -r ~standup/.logs + # Verifying Bitcoin: Signature echo "$0 - Verifying Bitcoin." diff --git a/Scripts/StandUp.sh b/Scripts/StandUp.sh index a9916ee..9dd578e 100644 --- a/Scripts/StandUp.sh +++ b/Scripts/StandUp.sh @@ -305,13 +305,19 @@ echo "$0 - Downloading Bitcoin; this will also take a while!" export BITCOIN="bitcoin-core-23.0" export BITCOINPLAIN=`echo $BITCOIN | sed 's/bitcoin-core/bitcoin/'` -sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -O ~standup/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~standup/SHA256SUMS.asc -sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS +sudo -u standup mkdir ~standup/.logs -sudo -u standup wget https://raw.githubusercontent.com/bitcoin/bitcoin/23.x/contrib/builder-keys/keys.txt -O ~standup/keys.txt +sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -O ~standup/$BITCOINPLAIN-x86_64-linux-gnu.tar.gz -a ~standup/.logs/wget +sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~standup/SHA256SUMS.asc -a ~standup/.logs/wget +sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS -a ~standup/.logs/wget + +sudo -u standup wget https://raw.githubusercontent.com/bitcoin/bitcoin/23.x/contrib/builder-keys/keys.txt -O ~standup/keys.txt -a ~standup/.logs/wget sudo -u standup sh -c 'while read fingerprint keyholder_name; do gpg --keyserver hkps://keys.openpgp.org --recv-keys ${fingerprint}; done < ~standup/keys.txt' +cat ~standup/.logs/wget >> /standup.log +cat ~standup/.logs/wget >> /standup.err +rm -r ~standup/.logs + # Verifying Bitcoin: Signature echo "$0 - Verifying Bitcoin."