From fef7ea62116d8c3121e4e147e83342abb73e4d35 Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Thu, 19 Oct 2023 21:16:16 +0200 Subject: [PATCH 1/8] install git and keys from https://github.com/bitcoin-core/guix.sigs --- Scripts/StandUp.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Scripts/StandUp.sh b/Scripts/StandUp.sh index 9dd578e..eefc919 100644 --- a/Scripts/StandUp.sh +++ b/Scripts/StandUp.sh @@ -138,6 +138,9 @@ apt-get install gnupg -y # Install dirmngr apt-get install dirmngr +# Install git +apt-get install git + # Set system to automatically update echo "unattended-upgrades unattended-upgrades/enable_auto_updates boolean true" | debconf-set-selections apt-get -y install unattended-upgrades @@ -311,8 +314,8 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-l 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' +sudo -u standup git clone https://github.com/bitcoin-core/guix.sigs ~standup/guix.sigs +sudo -u standup gpg --import ~standup/guix.sigs/builder-keys/* cat ~standup/.logs/wget >> /standup.log cat ~standup/.logs/wget >> /standup.err From d37f9c310ed48f68d08fefd39224319094b2da0e Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Thu, 19 Oct 2023 21:29:19 +0200 Subject: [PATCH 2/8] remove empty space and update to 25.0 --- Scripts/StandUp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/StandUp.sh b/Scripts/StandUp.sh index eefc919..4c69d00 100644 --- a/Scripts/StandUp.sh +++ b/Scripts/StandUp.sh @@ -305,7 +305,7 @@ echo "$0 - Downloading Bitcoin; this will also take a while!" # CURRENT BITCOIN RELEASE: # Change as necessary -export BITCOIN="bitcoin-core-23.0" +export BITCOIN="bitcoin-core-25.0" export BITCOINPLAIN=`echo $BITCOIN | sed 's/bitcoin-core/bitcoin/'` sudo -u standup mkdir ~standup/.logs @@ -315,7 +315,7 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~sta sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS -a ~standup/.logs/wget sudo -u standup git clone https://github.com/bitcoin-core/guix.sigs ~standup/guix.sigs -sudo -u standup gpg --import ~standup/guix.sigs/builder-keys/* +sudo -u standup gpg --import ~standup/guix.sigs/builder-keys/* cat ~standup/.logs/wget >> /standup.log cat ~standup/.logs/wget >> /standup.err From 2d155574d646ff472d90703fd1b30cce9e581a82 Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Fri, 20 Oct 2023 20:48:22 +0200 Subject: [PATCH 3/8] update linode script --- Scripts/LinodeStandUp.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Scripts/LinodeStandUp.sh b/Scripts/LinodeStandUp.sh index c583f2a..7605262 100644 --- a/Scripts/LinodeStandUp.sh +++ b/Scripts/LinodeStandUp.sh @@ -82,7 +82,7 @@ fi # CURRENT BITCOIN RELEASE: # Change as necessary -export BITCOIN="bitcoin-core-23.0" +export BITCOIN="bitcoin-core-25.0" # Output stdout and stderr to ~root files exec > >(tee -a /standup.log) 2> >(tee -a /standup.log /standup.err >&2) @@ -135,6 +135,9 @@ apt-get install haveged -y # Install GPG apt-get install gnupg -y +# Install git +apt-get install git + # Set system to automatically update echo "unattended-upgrades unattended-upgrades/enable_auto_updates boolean true" | debconf-set-selections apt-get -y install unattended-upgrades @@ -273,8 +276,8 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-l 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' +sudo -u standup git clone https://github.com/bitcoin-core/guix.sigs ~standup/guix.sigs +sudo -u standup gpg --import ~standup/guix.sig cat ~standup/.logs/wget >> /standup.log cat ~standup/.logs/wget >> /standup.err From 308630ba487b6775bc660d38db244dd993d2c13d Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Fri, 20 Oct 2023 21:00:26 +0200 Subject: [PATCH 4/8] fix incomplete command --- Scripts/LinodeStandUp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/LinodeStandUp.sh b/Scripts/LinodeStandUp.sh index 7605262..841fd4e 100644 --- a/Scripts/LinodeStandUp.sh +++ b/Scripts/LinodeStandUp.sh @@ -277,7 +277,7 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~sta sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS -a ~standup/.logs/wget sudo -u standup git clone https://github.com/bitcoin-core/guix.sigs ~standup/guix.sigs -sudo -u standup gpg --import ~standup/guix.sig +sudo -u standup gpg --import ~standup/guix.sigs/builder-keys/* cat ~standup/.logs/wget >> /standup.log cat ~standup/.logs/wget >> /standup.err From e9870efafc827dc6f8a8ff00af43ff9829fb78ec Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Sat, 21 Oct 2023 12:05:32 +0200 Subject: [PATCH 5/8] drop git and download guix.sigs as zipped file via wget --- Scripts/StandUp.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Scripts/StandUp.sh b/Scripts/StandUp.sh index 4c69d00..3dbb0a6 100644 --- a/Scripts/StandUp.sh +++ b/Scripts/StandUp.sh @@ -138,8 +138,8 @@ apt-get install gnupg -y # Install dirmngr apt-get install dirmngr -# Install git -apt-get install git +# Install unzip +apt-get install unzip # Set system to automatically update echo "unattended-upgrades unattended-upgrades/enable_auto_updates boolean true" | debconf-set-selections @@ -314,8 +314,9 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-l 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 git clone https://github.com/bitcoin-core/guix.sigs ~standup/guix.sigs -sudo -u standup gpg --import ~standup/guix.sigs/builder-keys/* +sudo -u standup wget https://github.com/bitcoin-core/guix.sigs/archive/refs/heads/main.zip -O ~standup/guix.sigs-main.zip +sudo -u standup unzip ~standup/guix.sigs-main.zip +sudo -u standup gpg --import ~standup/guix.sigs-main/builder-keys/* cat ~standup/.logs/wget >> /standup.log cat ~standup/.logs/wget >> /standup.err From 17c879135005db9d8c2b280cfd0ed7256acb3bae Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Sat, 21 Oct 2023 12:31:29 +0200 Subject: [PATCH 6/8] add to unzip option -d --- Scripts/StandUp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/StandUp.sh b/Scripts/StandUp.sh index 3dbb0a6..d30702b 100644 --- a/Scripts/StandUp.sh +++ b/Scripts/StandUp.sh @@ -315,7 +315,7 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS.asc -O ~sta sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/SHA256SUMS -O ~standup/SHA256SUMS -a ~standup/.logs/wget sudo -u standup wget https://github.com/bitcoin-core/guix.sigs/archive/refs/heads/main.zip -O ~standup/guix.sigs-main.zip -sudo -u standup unzip ~standup/guix.sigs-main.zip +sudo -u standup unzip ~standup/guix.sigs-main.zip -d ~standup/ sudo -u standup gpg --import ~standup/guix.sigs-main/builder-keys/* cat ~standup/.logs/wget >> /standup.log From 824dd8b7ea8123440999cf8b3f1160b35c8ddaf0 Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Sat, 21 Oct 2023 12:39:18 +0200 Subject: [PATCH 7/8] append wget logs when downloading signatures --- Scripts/StandUp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/StandUp.sh b/Scripts/StandUp.sh index d30702b..b16ff40 100644 --- a/Scripts/StandUp.sh +++ b/Scripts/StandUp.sh @@ -314,7 +314,7 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-l 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://github.com/bitcoin-core/guix.sigs/archive/refs/heads/main.zip -O ~standup/guix.sigs-main.zip +sudo -u standup wget https://github.com/bitcoin-core/guix.sigs/archive/refs/heads/main.zip -O ~standup/guix.sigs-main.zip -a ~standup/.logs/wget sudo -u standup unzip ~standup/guix.sigs-main.zip -d ~standup/ sudo -u standup gpg --import ~standup/guix.sigs-main/builder-keys/* From 34a6c3bc09305755f03af743e1404daab5466fb4 Mon Sep 17 00:00:00 2001 From: BuildWithData <@Buildwd> Date: Sat, 21 Oct 2023 12:59:40 +0200 Subject: [PATCH 8/8] update linode script --- Scripts/LinodeStandUp.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Scripts/LinodeStandUp.sh b/Scripts/LinodeStandUp.sh index 841fd4e..e3f3612 100644 --- a/Scripts/LinodeStandUp.sh +++ b/Scripts/LinodeStandUp.sh @@ -135,8 +135,8 @@ apt-get install haveged -y # Install GPG apt-get install gnupg -y -# Install git -apt-get install git +# Install unzip +apt-get install unzip # Set system to automatically update echo "unattended-upgrades unattended-upgrades/enable_auto_updates boolean true" | debconf-set-selections @@ -276,8 +276,9 @@ sudo -u standup wget https://bitcoincore.org/bin/$BITCOIN/$BITCOINPLAIN-x86_64-l 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 git clone https://github.com/bitcoin-core/guix.sigs ~standup/guix.sigs -sudo -u standup gpg --import ~standup/guix.sigs/builder-keys/* +sudo -u standup wget https://github.com/bitcoin-core/guix.sigs/archive/refs/heads/main.zip -O ~standup/guix.sigs-main.zip -a ~standup/.logs/wget +sudo -u standup unzip ~standup/guix.sigs-main.zip -d ~standup/ +sudo -u standup gpg --import ~standup/guix.sigs-main/builder-keys/* cat ~standup/.logs/wget >> /standup.log cat ~standup/.logs/wget >> /standup.err