From 2b294d93dbf3d1bb9d9429115f7d04a9ad5738be Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 8 Oct 2023 05:59:52 -0600 Subject: [PATCH 01/10] Next version - 2.1.1 placeholder for now. --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- config/plotman.sample.yaml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9003720..249471f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] - 2023-?-? +### Added + - Settings | Plotting | Bladebit now supports "no_direct_io: true" option +### Changed +### Updated + ## [2.1.0] - 2023-10-06 ### Updated - [Bladebit](https://github.com/Chia-Network/bladebit/releases/tag/v3.1.0) to v3.1.0 - Supporting hybrid GPU/disk plotting with either 128 GB or 16 GB RAM. diff --git a/VERSION b/VERSION index 50aea0e7..7c327287 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 \ No newline at end of file +2.1.1 \ No newline at end of file diff --git a/config/plotman.sample.yaml b/config/plotman.sample.yaml index 4dce85c9..0ef6f3d7 100644 --- a/config/plotman.sample.yaml +++ b/config/plotman.sample.yaml @@ -105,6 +105,7 @@ plotting: # BladeBit plotter; see https://github.com/guydavis/machinaris/wiki/Bladebit threads: 4 # Threads per job no_numa: true # Whether to disable NUMA memory support or not + no_direct_io: false # Whether to disable DirectIO writes to to destination media compression: 0 # Compression level (default = 0, min = 0, max = 6) mode: diskplot # Either enable ramplot, diskplot, or gpuplot. diskplot_cache: 4GB # If diskplot, amount of RAM to allocate to caching disk writes From 8ab5dc28d4cfb62c9a0ca2795dce53fae75ea3f0 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Tue, 10 Oct 2023 17:43:13 -0600 Subject: [PATCH 02/10] Chia @ 2.1.1-rc1 --- scripts/forks/chia_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index ad7385c7..1c38fedd 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" = "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0/chia-blockchain-cli_2.1.0-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1-rc1/chia-blockchain-cli_2.1.1rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb elif [[ "${arch_name}" = "arm64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.0/chia-blockchain-cli_2.1.0-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1-rc1/chia-blockchain-cli_2.1.1rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb else echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}" From f3abcb2c68536b69d110e10ea575fc24196fe941 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 08:59:25 -0600 Subject: [PATCH 03/10] Chia not setting correct permissions. --- scripts/forks/chia_launch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index 2717bfa5..b081b34f 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -50,6 +50,7 @@ fi mkdir -p /root/.chia/mainnet/log chia init >> /root/.chia/mainnet/log/init.log 2>&1 +chia init --fix-ssl-permissions > /dev/null echo 'Configuring Chia...' if [ ! -f /root/.chia/mainnet/config/config.yaml ]; then From 06127fde4d72808db5ae53c2f6fc32e7d1035a0e Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 10:04:15 -0600 Subject: [PATCH 04/10] More on why Chia can't set its own permssions... --- scripts/forks/chia_launch.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index b081b34f..259e7089 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -50,7 +50,6 @@ fi mkdir -p /root/.chia/mainnet/log chia init >> /root/.chia/mainnet/log/init.log 2>&1 -chia init --fix-ssl-permissions > /dev/null echo 'Configuring Chia...' if [ ! -f /root/.chia/mainnet/config/config.yaml ]; then @@ -85,7 +84,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null -chia init --fix-ssl-permissions > /dev/null +chia init --fix-ssl-permissions /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh From e53026bda9692e2bf1fce907b9f50b7e7cad8e89 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 14:42:52 -0600 Subject: [PATCH 05/10] Clean up uname value selection. --- scripts/bladebit_setup.sh | 44 ++++++++++++++++------------------- scripts/config_api_server.sh | 2 +- scripts/forks/chia_install.sh | 4 +--- scripts/forks/chia_launch.sh | 2 +- scripts/madmax_setup.sh | 34 ++++++++++++--------------- 5 files changed, 38 insertions(+), 48 deletions(-) diff --git a/scripts/bladebit_setup.sh b/scripts/bladebit_setup.sh index 5d6242a5..8eac9d68 100644 --- a/scripts/bladebit_setup.sh +++ b/scripts/bladebit_setup.sh @@ -9,32 +9,28 @@ BLADEBIT_BRANCH=$1 # Now ignored as install binaries from Github. if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'chia') ]]; then if [ ! -f /usr/bin/bladebit ] && [[ "${bladebit_skip_build}" != 'true' ]]; then arch_name="$(uname -m)" - if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then - apt update && apt install -y build-essential cmake libgmp-dev libnuma-dev - cd / + apt update && apt install -y build-essential cmake libgmp-dev libnuma-dev + cd / && echo "Installing bladebit on ${arch_name}..." - # Now install CNI's separate binary for actual GPU plotting... - cd /opt/chia/bladebit - rm -f ./bladebit # Remove stale version bundled in the DEB package. - if [[ "${arch_name}" = "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-x86-64.tar.gz - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-x86-64.tar.gz - else - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-arm64.tar.gz - curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-arm64.tar.gz - fi - tar -xvf bladebit-v3.*.tar.gz - tar -xvf bladebit-cuda-v3.*.tar.gz - rm -f *tar.gz - chmod 755 bladebit* - chown root.root ./bladebit* - - ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit - cd / && echo "Bladebit version: "`bladebit --version` - ln -s /opt/chia/bladebit/bladebit_cuda /usr/bin/bladebit_cuda - cd / && echo "Bladebit CUDA version: "`bladebit_cuda --version` + # Now install CNI's separate binary for actual GPU plotting... + cd /opt/chia/bladebit + rm -f ./bladebit # Remove stale version bundled in the DEB package. + if [[ "${arch_name}" = "x86_64" ]]; then + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-x86-64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-x86-64.tar.gz else - echo "Bladebit binary download skipped -> unsupported architecture: ${arch_name}" + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-v3.1.0-ubuntu-arm64.tar.gz + curl -sLJO https://github.com/Chia-Network/bladebit/releases/download/v3.1.0/bladebit-cuda-v3.1.0-ubuntu-arm64.tar.gz fi + tar -xvf bladebit-v3.*.tar.gz + tar -xvf bladebit-cuda-v3.*.tar.gz + rm -f *tar.gz + chmod 755 bladebit* + chown root.root ./bladebit* + + ln -s /opt/chia/bladebit/bladebit /usr/bin/bladebit + cd / && echo "Bladebit version: "`bladebit --version` + ln -s /opt/chia/bladebit/bladebit_cuda /usr/bin/bladebit_cuda + cd / && echo "Bladebit CUDA version: "`bladebit_cuda --version` fi fi diff --git a/scripts/config_api_server.sh b/scripts/config_api_server.sh index f7469282..1e4cc19e 100644 --- a/scripts/config_api_server.sh +++ b/scripts/config_api_server.sh @@ -8,7 +8,7 @@ if [ ! -f "${API_SETTINGS_FILE}" ]; then arch_name="$(uname -m)" echo "Configuring API server for arch_name=${arch_name}" if [ "${mode}" == "fullnode" ]; then - if [ "${arch_name}" = "aarch64" ]; then + if [ "${arch_name}" != "x86_64" ]; then echo "STATUS_EVERY_X_MINUTES = 4" > ${API_SETTINGS_FILE} else echo "STATUS_EVERY_X_MINUTES = 2" > ${API_SETTINGS_FILE} diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index 1c38fedd..cf06f421 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -29,10 +29,8 @@ else if [[ "${arch_name}" = "x86_64" ]]; then curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1-rc1/chia-blockchain-cli_2.1.1rc1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb - elif [[ "${arch_name}" = "arm64" ]]; then + else curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1-rc1/chia-blockchain-cli_2.1.1rc1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb - else - echo "Installing Chia CUDA binaries skipped -> unsupported architecture: ${arch_name}" fi fi diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index 259e7089..d508d9d7 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -84,7 +84,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null -chia init --fix-ssl-permissions +chia init --fix-ssl-permissions &> /dev/null /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh index 8b5c5ca9..b06d5c1d 100644 --- a/scripts/madmax_setup.sh +++ b/scripts/madmax_setup.sh @@ -12,26 +12,22 @@ CLASSIC_MADMAX_BRANCH=master if [[ (${mode} =~ ^fullnode.* || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then arch_name="$(uname -m)" - if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then - apt update && apt install -y libsodium-dev cmake g++ git build-essential - cd / - git clone --branch ${CLASSIC_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git - cd chia-plotter && echo "Building madmax on ${arch_name}..." - if [[ -z "${madmax_relic_main}" ]]; then # Hack on 2021-11-29 due to failed builds on some systems... - sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt - fi - git submodule update --init - git checkout $HASH - ./make_devel.sh - mkdir -p /usr/lib/chia-plotter - cp -r ./build/* /usr/lib/chia-plotter - ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot - ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34 - cd / - rm -rf chia-plotter - else - echo "Building madmax skipped -> unsupported architecture: ${arch_name}" + apt update && apt install -y libsodium-dev cmake g++ git build-essential + cd / + git clone --branch ${CLASSIC_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git + cd chia-plotter && echo "Building madmax on ${arch_name}..." + if [[ -z "${madmax_relic_main}" ]]; then # Hack on 2021-11-29 due to failed builds on some systems... + sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt fi + git submodule update --init + git checkout $HASH + ./make_devel.sh + mkdir -p /usr/lib/chia-plotter + cp -r ./build/* /usr/lib/chia-plotter + ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot + ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34 + cd / + rm -rf chia-plotter fi fi From 415f2ade42b15b91ffeb4e58a22a79f3b0f5bcb8 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 14:44:27 -0600 Subject: [PATCH 06/10] Chia 2.1.1 --- scripts/forks/chia_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh index cf06f421..5d144c6d 100644 --- a/scripts/forks/chia_install.sh +++ b/scripts/forks/chia_install.sh @@ -27,10 +27,10 @@ else echo "Installing Chia CUDA binaries on ${arch_name}..." cd /tmp if [[ "${arch_name}" = "x86_64" ]]; then - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1-rc1/chia-blockchain-cli_2.1.1rc1-1_amd64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1/chia-blockchain-cli_2.1.1-1_amd64.deb apt-get install ./chia-blockchain-cli*.deb else - curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1-rc1/chia-blockchain-cli_2.1.1rc1-1_arm64.deb + curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.1.1/chia-blockchain-cli_2.1.1-1_arm64.deb apt-get install ./chia-blockchain-cli*.deb fi fi From 2d1f1d3bea1209a0caa1f86a99f1dd99b8757a09 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 15:02:52 -0600 Subject: [PATCH 07/10] More cleanups. --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- scripts/forks/apple_launch.sh | 4 ++-- scripts/forks/ballcoin_launch.sh | 4 ++-- scripts/forks/bpx_launch.sh | 4 ++-- scripts/forks/btcgreen_launch.sh | 4 ++-- scripts/forks/cactus_launch.sh | 4 ++-- scripts/forks/chia_launch.sh | 4 ++-- scripts/forks/chinilla_launch.sh | 4 ++-- scripts/forks/coffee_launch.sh | 4 ++-- scripts/forks/cryptodoge_launch.sh | 4 ++-- scripts/forks/ecostake_launch.sh | 4 ++-- scripts/forks/flax_launch.sh | 4 ++-- scripts/forks/flora_launch.sh | 4 ++-- scripts/forks/gigahorse_launch.sh | 4 ++-- scripts/forks/gold_launch.sh | 4 ++-- scripts/forks/greenbtc_launch.sh | 4 ++-- scripts/forks/hddcoin_launch.sh | 4 ++-- scripts/forks/littlelambocoin_launch.sh | 4 ++-- scripts/forks/maize_launch.sh | 2 +- scripts/forks/mint_launch.sh | 4 ++-- scripts/forks/nchain_launch.sh | 4 ++-- scripts/forks/one_launch.sh | 4 ++-- scripts/forks/petroleum_launch.sh | 4 ++-- scripts/forks/pipscoin_launch.sh | 4 ++-- scripts/forks/profit_launch.sh | 4 ++-- scripts/forks/shibgreen_launch.sh | 4 ++-- scripts/forks/silicoin_launch.sh | 4 ++-- scripts/forks/staicoin_launch.sh | 4 ++-- scripts/forks/stor_launch.sh | 4 ++-- scripts/forks/tad_launch.sh | 4 ++-- scripts/forks/wheat_launch.sh | 4 ++-- 33 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 76180fd6..df47d33c 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=release/2.1.0" + "CHIA_BRANCH=release/2.1.1" "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=master" "PLOTMAN_BRANCH=compress" diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index e6ce871f..1ec9eb62 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -44,7 +44,7 @@ jobs: build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "CHIA_BRANCH=release/2.1.0" + "CHIA_BRANCH=release/2.1.1" "MADMAX_BRANCH=v1.8.2.giga14" "BLADEBIT_BRANCH=master" tags: | diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index ee1d1fc5..dc940326 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=release/2.1.0" + "CHIA_BRANCH=release/2.1.1" "PLOTMAN_BRANCH=development" "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=v1.8.2.giga14" diff --git a/scripts/forks/apple_launch.sh b/scripts/forks/apple_launch.sh index 9297aa2a..82ac3f92 100644 --- a/scripts/forks/apple_launch.sh +++ b/scripts/forks/apple_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.apple/mainnet/config/ssl/ &> /dev/null -apple init --fix-ssl-permissions > /dev/null +apple init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.apple/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then apple init -c /root/.apple/farmer_ca 2>&1 > /root/.apple/mainnet/log/init.log chmod 755 -R /root/.apple/mainnet/config/ssl/ &> /dev/null - apple init --fix-ssl-permissions > /dev/null + apple init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.apple/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/ballcoin_launch.sh b/scripts/forks/ballcoin_launch.sh index f0eee62a..d41b448b 100644 --- a/scripts/forks/ballcoin_launch.sh +++ b/scripts/forks/ballcoin_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.ball/mainnet/config/ssl/ &> /dev/null -ball init --fix-ssl-permissions > /dev/null +ball init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.ball/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then ball init -c /root/.ball/farmer_ca 2>&1 > /root/.ball/mainnet/log/init.log chmod 755 -R /root/.ball/mainnet/config/ssl/ &> /dev/null - ball init --fix-ssl-permissions > /dev/null + ball init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.ball/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/bpx_launch.sh b/scripts/forks/bpx_launch.sh index 23e9bea3..ab336566 100644 --- a/scripts/forks/bpx_launch.sh +++ b/scripts/forks/bpx_launch.sh @@ -52,7 +52,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.bpx/mainnet/config/ssl/ &> /dev/null -bpx init --fix-ssl-permissions > /dev/null +bpx init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -104,7 +104,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.bpx/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then bpx init -c /root/.bpx/farmer_ca 2>&1 > /root/.bpx/mainnet/log/init.log chmod 755 -R /root/.bpx/mainnet/config/ssl/ &> /dev/null - bpx init --fix-ssl-permissions > /dev/null + bpx init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.bpx/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/btcgreen_launch.sh b/scripts/forks/btcgreen_launch.sh index 88bb69f0..8da51b5b 100644 --- a/scripts/forks/btcgreen_launch.sh +++ b/scripts/forks/btcgreen_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.btcgreen/mainnet/config/ssl/ &> /dev/null -btcgreen init --fix-ssl-permissions > /dev/null +btcgreen init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.btcgreen/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then btcgreen init -c /root/.btcgreen/farmer_ca 2>&1 > /root/.btcgreen/mainnet/log/init.log chmod 755 -R /root/.btcgreen/mainnet/config/ssl/ &> /dev/null - btcgreen init --fix-ssl-permissions > /dev/null + btcgreen init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.btcgreen/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/cactus_launch.sh b/scripts/forks/cactus_launch.sh index 901872e2..58f8ca7d 100644 --- a/scripts/forks/cactus_launch.sh +++ b/scripts/forks/cactus_launch.sh @@ -57,7 +57,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.cactus/mainnet/config/ssl/ &> /dev/null -cactus init --fix-ssl-permissions > /dev/null +cactus init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -109,7 +109,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.cactus/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then cactus init -c /root/.cactus/farmer_ca 2>&1 > /root/.cactus/mainnet/log/init.log chmod 755 -R /root/.cactus/mainnet/config/ssl/ &> /dev/null - cactus init --fix-ssl-permissions > /dev/null + cactus init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.cactus/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index d508d9d7..1fd2337c 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -84,7 +84,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null -chia init --fix-ssl-permissions &> /dev/null +chia init --fix-ssl-permissions 2>&1 >/dev/null /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh @@ -124,7 +124,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.chia/farmer_ca/chia_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then chia init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null - chia init --fix-ssl-permissions > /dev/null + chia init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.chia/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/chinilla_launch.sh b/scripts/forks/chinilla_launch.sh index b4c21eff..1d85475f 100644 --- a/scripts/forks/chinilla_launch.sh +++ b/scripts/forks/chinilla_launch.sh @@ -53,7 +53,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chinilla/vanillanet/config/ssl/ &> /dev/null -chinilla init --fix-ssl-permissions > /dev/null +chinilla init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -105,7 +105,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.chinilla/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then chinilla init -c /root/.chinilla/farmer_ca 2>&1 > /root/.chinilla/vanillanet/log/init.log chmod 755 -R /root/.chinilla/vanillanet/config/ssl/ &> /dev/null - chinilla init --fix-ssl-permissions > /dev/null + chinilla init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.chinilla/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/coffee_launch.sh b/scripts/forks/coffee_launch.sh index b2770e6b..f0a017ae 100644 --- a/scripts/forks/coffee_launch.sh +++ b/scripts/forks/coffee_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.coffee/mainnet/config/ssl/ &> /dev/null -coffee init --fix-ssl-permissions > /dev/null +coffee init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.coffee/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then coffee init -c /root/.coffee/farmer_ca 2>&1 > /root/.coffee/mainnet/log/init.log chmod 755 -R /root/.coffee/mainnet/config/ssl/ &> /dev/null - coffee init --fix-ssl-permissions > /dev/null + coffee init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.coffee/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/cryptodoge_launch.sh b/scripts/forks/cryptodoge_launch.sh index 3856a81e..43b09dda 100644 --- a/scripts/forks/cryptodoge_launch.sh +++ b/scripts/forks/cryptodoge_launch.sh @@ -53,7 +53,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.cryptodoge/mainnet/config/ssl/ &> /dev/null -cryptodoge init --fix-ssl-permissions > /dev/null +cryptodoge init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -105,7 +105,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.cryptodoge/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then cryptodoge init -c /root/.cryptodoge/farmer_ca 2>&1 > /root/.cryptodoge/mainnet/log/init.log chmod 755 -R /root/.cryptodoge/mainnet/config/ssl/ &> /dev/null - cryptodoge init --fix-ssl-permissions > /dev/null + cryptodoge init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.cryptodoge/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/ecostake_launch.sh b/scripts/forks/ecostake_launch.sh index 7d000133..fc919df2 100644 --- a/scripts/forks/ecostake_launch.sh +++ b/scripts/forks/ecostake_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.ecostake/mainnet/config/ssl/ &> /dev/null -ecostake init --fix-ssl-permissions > /dev/null +ecostake init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.ecostake/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then ecostake init -c /root/.ecostake/farmer_ca 2>&1 > /root/.ecostake/mainnet/log/init.log chmod 755 -R /root/.ecostake/mainnet/config/ssl/ &> /dev/null - ecostake init --fix-ssl-permissions > /dev/null + ecostake init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.ecostake/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/flax_launch.sh b/scripts/forks/flax_launch.sh index 61637044..f265ba61 100644 --- a/scripts/forks/flax_launch.sh +++ b/scripts/forks/flax_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.flax/mainnet/config/ssl/ &> /dev/null -flax init --fix-ssl-permissions > /dev/null +flax init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.flax/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then flax init -c /root/.flax/farmer_ca 2>&1 > /root/.flax/mainnet/log/init.log chmod 755 -R /root/.flax/mainnet/config/ssl/ &> /dev/null - flax init --fix-ssl-permissions > /dev/null + flax init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.flax/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/flora_launch.sh b/scripts/forks/flora_launch.sh index 4a40f5e4..57acde2e 100644 --- a/scripts/forks/flora_launch.sh +++ b/scripts/forks/flora_launch.sh @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.flora/mainnet/config/ssl/ &> /dev/null -flora init --fix-ssl-permissions > /dev/null +flora init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.flora/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then flora init -c /root/.flora/farmer_ca 2>&1 > /root/.flora/mainnet/log/init.log chmod 755 -R /root/.flora/mainnet/config/ssl/ &> /dev/null - flora init --fix-ssl-permissions > /dev/null + flora init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.flora/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh index 6e330e50..5ee8e80c 100644 --- a/scripts/forks/gigahorse_launch.sh +++ b/scripts/forks/gigahorse_launch.sh @@ -85,7 +85,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null -/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions > /dev/null +/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions 2>&1 >/dev/null /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh @@ -117,7 +117,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.chia/farmer_ca/chia_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then /chia-gigahorse-farmer/chia.bin init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null - /chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions > /dev/null + /chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.chia/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/gold_launch.sh b/scripts/forks/gold_launch.sh index 9142dbc5..73066e95 100644 --- a/scripts/forks/gold_launch.sh +++ b/scripts/forks/gold_launch.sh @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.gold/mainnet/config/ssl/ &> /dev/null -gold init --fix-ssl-permissions > /dev/null +gold init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.gold/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then gold init -c /root/.gold/farmer_ca 2>&1 > /root/.gold/mainnet/log/init.log chmod 755 -R /root/.gold/mainnet/config/ssl/ &> /dev/null - gold init --fix-ssl-permissions > /dev/null + gold init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.gold/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/greenbtc_launch.sh b/scripts/forks/greenbtc_launch.sh index 3bcbfa64..260dbcac 100644 --- a/scripts/forks/greenbtc_launch.sh +++ b/scripts/forks/greenbtc_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.greenbtc/mainnet/config/ssl/ &> /dev/null -greenbtc init --fix-ssl-permissions > /dev/null +greenbtc init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.greenbtc/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then greenbtc init -c /root/.greenbtc/farmer_ca 2>&1 > /root/.greenbtc/mainnet/log/init.log chmod 755 -R /root/.greenbtc/mainnet/config/ssl/ &> /dev/null - greenbtc init --fix-ssl-permissions > /dev/null + greenbtc init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.greenbtc/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/hddcoin_launch.sh b/scripts/forks/hddcoin_launch.sh index ba5f12a4..5ae090ab 100644 --- a/scripts/forks/hddcoin_launch.sh +++ b/scripts/forks/hddcoin_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.hddcoin/mainnet/config/ssl/ &> /dev/null -hddcoin init --fix-ssl-permissions > /dev/null +hddcoin init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.hddcoin/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then hddcoin init -c /root/.hddcoin/farmer_ca 2>&1 > /root/.hddcoin/mainnet/log/init.log chmod 755 -R /root/.hddcoin/mainnet/config/ssl/ &> /dev/null - hddcoin init --fix-ssl-permissions > /dev/null + hddcoin init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.hddcoin/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/littlelambocoin_launch.sh b/scripts/forks/littlelambocoin_launch.sh index 39e87e5b..11477f95 100644 --- a/scripts/forks/littlelambocoin_launch.sh +++ b/scripts/forks/littlelambocoin_launch.sh @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.littlelambocoin/mainnet/config/ssl/ &> /dev/null -littlelambocoin init --fix-ssl-permissions > /dev/null +littlelambocoin init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.littlelambocoin/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then littlelambocoin init -c /root/.littlelambocoin/farmer_ca 2>&1 > /root/.littlelambocoin/mainnet/log/init.log chmod 755 -R /root/.littlelambocoin/mainnet/config/ssl/ &> /dev/null - littlelambocoin init --fix-ssl-permissions > /dev/null + littlelambocoin init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.littlelambocoin/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/maize_launch.sh b/scripts/forks/maize_launch.sh index 1875dc77..a897dfbc 100644 --- a/scripts/forks/maize_launch.sh +++ b/scripts/forks/maize_launch.sh @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.maize/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then maize init -c /root/.maize/farmer_ca 2>&1 > /root/.maize/mainnet/log/init.log #chmod 755 -R /root/.maize/mainnet/config/ssl/ &> /dev/null - #maize init --fix-ssl-permissions > /dev/null + #maize init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.maize/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/mint_launch.sh b/scripts/forks/mint_launch.sh index 7069b571..a3f2b6c0 100644 --- a/scripts/forks/mint_launch.sh +++ b/scripts/forks/mint_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.mint/mainnet/config/ssl/ &> /dev/null -mint init --fix-ssl-permissions > /dev/null +mint init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.mint/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then mint init -c /root/.mint/farmer_ca 2>&1 > /root/.mint/mainnet/log/init.log chmod 755 -R /root/.mint/mainnet/config/ssl/ &> /dev/null - mint init --fix-ssl-permissions > /dev/null + mint init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.mint/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/nchain_launch.sh b/scripts/forks/nchain_launch.sh index 38b89052..4e5b8859 100644 --- a/scripts/forks/nchain_launch.sh +++ b/scripts/forks/nchain_launch.sh @@ -50,7 +50,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/ext9/config/ssl/ &> /dev/null -chia init --fix-ssl-permissions > /dev/null +chia init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -102,7 +102,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.ext9/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then chia init -c /root/.ext9/farmer_ca 2>&1 > /root/.chia/ext9/log/init.log chmod 755 -R /root/.chia/ext9/config/ssl/ &> /dev/null - chia init --fix-ssl-permissions > /dev/null + chia init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.ext9/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/one_launch.sh b/scripts/forks/one_launch.sh index 58c52ce2..1cdf863b 100644 --- a/scripts/forks/one_launch.sh +++ b/scripts/forks/one_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.one/mainnet/config/ssl/ &> /dev/null -one init --fix-ssl-permissions > /dev/null +one init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.one/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then one init -c /root/.one/farmer_ca 2>&1 > /root/.one/mainnet/log/init.log chmod 755 -R /root/.one/mainnet/config/ssl/ &> /dev/null - one init --fix-ssl-permissions > /dev/null + one init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.one/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/petroleum_launch.sh b/scripts/forks/petroleum_launch.sh index 6b7d66c0..a93f598a 100644 --- a/scripts/forks/petroleum_launch.sh +++ b/scripts/forks/petroleum_launch.sh @@ -50,7 +50,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.petroleum/mainnet/config/ssl/ &> /dev/null -petroleum init --fix-ssl-permissions > /dev/null +petroleum init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -102,7 +102,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.petroleum/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then petroleum init -c /root/.petroleum/farmer_ca 2>&1 > /root/.petroleum/mainnet/log/init.log chmod 755 -R /root/.petroleum/mainnet/config/ssl/ &> /dev/null - petroleum init --fix-ssl-permissions > /dev/null + petroleum init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.petroleum/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/pipscoin_launch.sh b/scripts/forks/pipscoin_launch.sh index 152d478b..65e535b0 100644 --- a/scripts/forks/pipscoin_launch.sh +++ b/scripts/forks/pipscoin_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.pipscoin/mainnet/config/ssl/ &> /dev/null -pipscoin init --fix-ssl-permissions > /dev/null +pipscoin init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.pipscoin/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then pipscoin init -c /root/.pipscoin/farmer_ca 2>&1 > /root/.pipscoin/mainnet/log/init.log chmod 755 -R /root/.pipscoin/mainnet/config/ssl/ &> /dev/null - pipscoin init --fix-ssl-permissions > /dev/null + pipscoin init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.pipscoin/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/profit_launch.sh b/scripts/forks/profit_launch.sh index 4a056b13..2ebb0da9 100644 --- a/scripts/forks/profit_launch.sh +++ b/scripts/forks/profit_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.profit/mainnet/config/ssl/ &> /dev/null -profit init --fix-ssl-permissions > /dev/null +profit init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.profit/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then profit init -c /root/.profit/farmer_ca 2>&1 > /root/.profit/mainnet/log/init.log chmod 755 -R /root/.profit/mainnet/config/ssl/ &> /dev/null - profit init --fix-ssl-permissions > /dev/null + profit init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.profit/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/shibgreen_launch.sh b/scripts/forks/shibgreen_launch.sh index fd1033fd..1b815148 100644 --- a/scripts/forks/shibgreen_launch.sh +++ b/scripts/forks/shibgreen_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.shibgreen/mainnet/config/ssl/ &> /dev/null -shibgreen init --fix-ssl-permissions > /dev/null +shibgreen init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.shibgreen/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then shibgreen init -c /root/.shibgreen/farmer_ca 2>&1 > /root/.shibgreen/mainnet/log/init.log chmod 755 -R /root/.shibgreen/mainnet/config/ssl/ &> /dev/null - shibgreen init --fix-ssl-permissions > /dev/null + shibgreen init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.shibgreen/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/silicoin_launch.sh b/scripts/forks/silicoin_launch.sh index 26e039ea..27b5ffc0 100644 --- a/scripts/forks/silicoin_launch.sh +++ b/scripts/forks/silicoin_launch.sh @@ -68,7 +68,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.sit/mainnet/config/ssl/ &> /dev/null -sit init --fix-ssl-permissions > /dev/null +sit init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -120,7 +120,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.sit/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then sit init -c /root/.sit/farmer_ca 2>&1 > /root/.sit/mainnet/log/init.log chmod 755 -R /root/.sit/mainnet/config/ssl/ &> /dev/null - sit init --fix-ssl-permissions > /dev/null + sit init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.sit/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/staicoin_launch.sh b/scripts/forks/staicoin_launch.sh index 39c282bc..2d6373b0 100644 --- a/scripts/forks/staicoin_launch.sh +++ b/scripts/forks/staicoin_launch.sh @@ -60,7 +60,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.stai/mainnet/config/ssl/ &> /dev/null -stai init --fix-ssl-permissions > /dev/null +stai init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -112,7 +112,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.stai/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then stai init -c /root/.stai/farmer_ca 2>&1 > /root/.stai/mainnet/log/init.log chmod 755 -R /root/.stai/mainnet/config/ssl/ &> /dev/null - stai init --fix-ssl-permissions > /dev/null + stai init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.stai/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/stor_launch.sh b/scripts/forks/stor_launch.sh index 14868700..fb21c59d 100644 --- a/scripts/forks/stor_launch.sh +++ b/scripts/forks/stor_launch.sh @@ -56,7 +56,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.stor/mainnet/config/ssl/ &> /dev/null -stor init --fix-ssl-permissions > /dev/null +stor init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -108,7 +108,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.stor/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then stor init -c /root/.stor/farmer_ca 2>&1 > /root/.stor/mainnet/log/init.log chmod 755 -R /root/.stor/mainnet/config/ssl/ &> /dev/null - stor init --fix-ssl-permissions > /dev/null + stor init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.stor/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/tad_launch.sh b/scripts/forks/tad_launch.sh index 0db497c8..0e24167e 100644 --- a/scripts/forks/tad_launch.sh +++ b/scripts/forks/tad_launch.sh @@ -56,7 +56,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.tad/mainnet/config/ssl/ &> /dev/null -tad init --fix-ssl-permissions > /dev/null +tad init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -108,7 +108,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.tad/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then tad init -c /root/.tad/farmer_ca 2>&1 > /root/.tad/mainnet/log/init.log chmod 755 -R /root/.tad/mainnet/config/ssl/ &> /dev/null - tad init --fix-ssl-permissions > /dev/null + tad init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.tad/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/wheat_launch.sh b/scripts/forks/wheat_launch.sh index ef88217d..a7c825cd 100644 --- a/scripts/forks/wheat_launch.sh +++ b/scripts/forks/wheat_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.wheat/mainnet/config/ssl/ &> /dev/null -wheat init --fix-ssl-permissions > /dev/null +wheat init --fix-ssl-permissions 2>&1 >/dev/null # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.wheat/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then wheat init -c /root/.wheat/farmer_ca 2>&1 > /root/.wheat/mainnet/log/init.log chmod 755 -R /root/.wheat/mainnet/config/ssl/ &> /dev/null - wheat init --fix-ssl-permissions > /dev/null + wheat init --fix-ssl-permissions 2>&1 >/dev/null else echo "Did not find your farmer's certificates within /root/.wheat/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" From 7380b272f84446b8efe2b1279c2b211646b7ab6b Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 15:20:28 -0600 Subject: [PATCH 08/10] Remaining employees at CNI are changing branching practices... --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index df47d33c..716de3e0 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=release/2.1.1" + "CHIA_BRANCH=release/2.1.2" "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=master" "PLOTMAN_BRANCH=compress" diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index 1ec9eb62..83d561da 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -44,7 +44,7 @@ jobs: build-args: | "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" - "CHIA_BRANCH=release/2.1.1" + "CHIA_BRANCH=release/2.1.2" "MADMAX_BRANCH=v1.8.2.giga14" "BLADEBIT_BRANCH=master" tags: | diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index dc940326..9fd0302c 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -44,7 +44,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" - "CHIA_BRANCH=release/2.1.1" + "CHIA_BRANCH=release/2.1.2" "PLOTMAN_BRANCH=development" "BLADEBIT_BRANCH=master" "MADMAX_BRANCH=v1.8.2.giga14" From e9a4deb1bcc6a69e3a182f89d5ed535027821e97 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Wed, 11 Oct 2023 15:42:04 -0600 Subject: [PATCH 09/10] Fix redirect. --- scripts/forks/apple_launch.sh | 4 ++-- scripts/forks/ballcoin_launch.sh | 4 ++-- scripts/forks/bpx_launch.sh | 4 ++-- scripts/forks/btcgreen_launch.sh | 4 ++-- scripts/forks/cactus_launch.sh | 4 ++-- scripts/forks/chia_launch.sh | 4 ++-- scripts/forks/chinilla_launch.sh | 4 ++-- scripts/forks/coffee_launch.sh | 4 ++-- scripts/forks/cryptodoge_launch.sh | 4 ++-- scripts/forks/ecostake_launch.sh | 4 ++-- scripts/forks/flax_launch.sh | 4 ++-- scripts/forks/flora_launch.sh | 4 ++-- scripts/forks/gigahorse_launch.sh | 4 ++-- scripts/forks/gold_launch.sh | 4 ++-- scripts/forks/greenbtc_launch.sh | 4 ++-- scripts/forks/hddcoin_launch.sh | 4 ++-- scripts/forks/littlelambocoin_launch.sh | 4 ++-- scripts/forks/maize_launch.sh | 2 +- scripts/forks/mint_launch.sh | 4 ++-- scripts/forks/nchain_launch.sh | 4 ++-- scripts/forks/one_launch.sh | 4 ++-- scripts/forks/petroleum_launch.sh | 4 ++-- scripts/forks/pipscoin_launch.sh | 4 ++-- scripts/forks/profit_launch.sh | 4 ++-- scripts/forks/shibgreen_launch.sh | 4 ++-- scripts/forks/silicoin_launch.sh | 4 ++-- scripts/forks/staicoin_launch.sh | 4 ++-- scripts/forks/stor_launch.sh | 4 ++-- scripts/forks/tad_launch.sh | 4 ++-- scripts/forks/wheat_launch.sh | 4 ++-- 30 files changed, 59 insertions(+), 59 deletions(-) diff --git a/scripts/forks/apple_launch.sh b/scripts/forks/apple_launch.sh index 82ac3f92..8c316200 100644 --- a/scripts/forks/apple_launch.sh +++ b/scripts/forks/apple_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.apple/mainnet/config/ssl/ &> /dev/null -apple init --fix-ssl-permissions 2>&1 >/dev/null +apple init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.apple/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then apple init -c /root/.apple/farmer_ca 2>&1 > /root/.apple/mainnet/log/init.log chmod 755 -R /root/.apple/mainnet/config/ssl/ &> /dev/null - apple init --fix-ssl-permissions 2>&1 >/dev/null + apple init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.apple/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/ballcoin_launch.sh b/scripts/forks/ballcoin_launch.sh index d41b448b..44d72c58 100644 --- a/scripts/forks/ballcoin_launch.sh +++ b/scripts/forks/ballcoin_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.ball/mainnet/config/ssl/ &> /dev/null -ball init --fix-ssl-permissions 2>&1 >/dev/null +ball init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.ball/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then ball init -c /root/.ball/farmer_ca 2>&1 > /root/.ball/mainnet/log/init.log chmod 755 -R /root/.ball/mainnet/config/ssl/ &> /dev/null - ball init --fix-ssl-permissions 2>&1 >/dev/null + ball init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.ball/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/bpx_launch.sh b/scripts/forks/bpx_launch.sh index ab336566..f64cfdae 100644 --- a/scripts/forks/bpx_launch.sh +++ b/scripts/forks/bpx_launch.sh @@ -52,7 +52,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.bpx/mainnet/config/ssl/ &> /dev/null -bpx init --fix-ssl-permissions 2>&1 >/dev/null +bpx init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -104,7 +104,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.bpx/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then bpx init -c /root/.bpx/farmer_ca 2>&1 > /root/.bpx/mainnet/log/init.log chmod 755 -R /root/.bpx/mainnet/config/ssl/ &> /dev/null - bpx init --fix-ssl-permissions 2>&1 >/dev/null + bpx init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.bpx/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/btcgreen_launch.sh b/scripts/forks/btcgreen_launch.sh index 8da51b5b..3cc49a18 100644 --- a/scripts/forks/btcgreen_launch.sh +++ b/scripts/forks/btcgreen_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.btcgreen/mainnet/config/ssl/ &> /dev/null -btcgreen init --fix-ssl-permissions 2>&1 >/dev/null +btcgreen init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.btcgreen/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then btcgreen init -c /root/.btcgreen/farmer_ca 2>&1 > /root/.btcgreen/mainnet/log/init.log chmod 755 -R /root/.btcgreen/mainnet/config/ssl/ &> /dev/null - btcgreen init --fix-ssl-permissions 2>&1 >/dev/null + btcgreen init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.btcgreen/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/cactus_launch.sh b/scripts/forks/cactus_launch.sh index 58f8ca7d..0881d407 100644 --- a/scripts/forks/cactus_launch.sh +++ b/scripts/forks/cactus_launch.sh @@ -57,7 +57,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.cactus/mainnet/config/ssl/ &> /dev/null -cactus init --fix-ssl-permissions 2>&1 >/dev/null +cactus init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -109,7 +109,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.cactus/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then cactus init -c /root/.cactus/farmer_ca 2>&1 > /root/.cactus/mainnet/log/init.log chmod 755 -R /root/.cactus/mainnet/config/ssl/ &> /dev/null - cactus init --fix-ssl-permissions 2>&1 >/dev/null + cactus init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.cactus/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/chia_launch.sh b/scripts/forks/chia_launch.sh index 1fd2337c..d8962bb6 100644 --- a/scripts/forks/chia_launch.sh +++ b/scripts/forks/chia_launch.sh @@ -84,7 +84,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null -chia init --fix-ssl-permissions 2>&1 >/dev/null +chia init --fix-ssl-permissions >/dev/null 2>&1 /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh @@ -124,7 +124,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.chia/farmer_ca/chia_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then chia init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null - chia init --fix-ssl-permissions 2>&1 >/dev/null + chia init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.chia/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/chinilla_launch.sh b/scripts/forks/chinilla_launch.sh index 1d85475f..7e0130ed 100644 --- a/scripts/forks/chinilla_launch.sh +++ b/scripts/forks/chinilla_launch.sh @@ -53,7 +53,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chinilla/vanillanet/config/ssl/ &> /dev/null -chinilla init --fix-ssl-permissions 2>&1 >/dev/null +chinilla init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -105,7 +105,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.chinilla/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then chinilla init -c /root/.chinilla/farmer_ca 2>&1 > /root/.chinilla/vanillanet/log/init.log chmod 755 -R /root/.chinilla/vanillanet/config/ssl/ &> /dev/null - chinilla init --fix-ssl-permissions 2>&1 >/dev/null + chinilla init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.chinilla/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/coffee_launch.sh b/scripts/forks/coffee_launch.sh index f0a017ae..e27521e2 100644 --- a/scripts/forks/coffee_launch.sh +++ b/scripts/forks/coffee_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.coffee/mainnet/config/ssl/ &> /dev/null -coffee init --fix-ssl-permissions 2>&1 >/dev/null +coffee init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.coffee/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then coffee init -c /root/.coffee/farmer_ca 2>&1 > /root/.coffee/mainnet/log/init.log chmod 755 -R /root/.coffee/mainnet/config/ssl/ &> /dev/null - coffee init --fix-ssl-permissions 2>&1 >/dev/null + coffee init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.coffee/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/cryptodoge_launch.sh b/scripts/forks/cryptodoge_launch.sh index 43b09dda..85eb81de 100644 --- a/scripts/forks/cryptodoge_launch.sh +++ b/scripts/forks/cryptodoge_launch.sh @@ -53,7 +53,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.cryptodoge/mainnet/config/ssl/ &> /dev/null -cryptodoge init --fix-ssl-permissions 2>&1 >/dev/null +cryptodoge init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -105,7 +105,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.cryptodoge/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then cryptodoge init -c /root/.cryptodoge/farmer_ca 2>&1 > /root/.cryptodoge/mainnet/log/init.log chmod 755 -R /root/.cryptodoge/mainnet/config/ssl/ &> /dev/null - cryptodoge init --fix-ssl-permissions 2>&1 >/dev/null + cryptodoge init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.cryptodoge/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/ecostake_launch.sh b/scripts/forks/ecostake_launch.sh index fc919df2..08028a7f 100644 --- a/scripts/forks/ecostake_launch.sh +++ b/scripts/forks/ecostake_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.ecostake/mainnet/config/ssl/ &> /dev/null -ecostake init --fix-ssl-permissions 2>&1 >/dev/null +ecostake init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.ecostake/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then ecostake init -c /root/.ecostake/farmer_ca 2>&1 > /root/.ecostake/mainnet/log/init.log chmod 755 -R /root/.ecostake/mainnet/config/ssl/ &> /dev/null - ecostake init --fix-ssl-permissions 2>&1 >/dev/null + ecostake init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.ecostake/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/flax_launch.sh b/scripts/forks/flax_launch.sh index f265ba61..3284d499 100644 --- a/scripts/forks/flax_launch.sh +++ b/scripts/forks/flax_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.flax/mainnet/config/ssl/ &> /dev/null -flax init --fix-ssl-permissions 2>&1 >/dev/null +flax init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.flax/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then flax init -c /root/.flax/farmer_ca 2>&1 > /root/.flax/mainnet/log/init.log chmod 755 -R /root/.flax/mainnet/config/ssl/ &> /dev/null - flax init --fix-ssl-permissions 2>&1 >/dev/null + flax init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.flax/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/flora_launch.sh b/scripts/forks/flora_launch.sh index 57acde2e..2092d6c3 100644 --- a/scripts/forks/flora_launch.sh +++ b/scripts/forks/flora_launch.sh @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.flora/mainnet/config/ssl/ &> /dev/null -flora init --fix-ssl-permissions 2>&1 >/dev/null +flora init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.flora/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then flora init -c /root/.flora/farmer_ca 2>&1 > /root/.flora/mainnet/log/init.log chmod 755 -R /root/.flora/mainnet/config/ssl/ &> /dev/null - flora init --fix-ssl-permissions 2>&1 >/dev/null + flora init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.flora/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/gigahorse_launch.sh b/scripts/forks/gigahorse_launch.sh index 5ee8e80c..012a5e8d 100644 --- a/scripts/forks/gigahorse_launch.sh +++ b/scripts/forks/gigahorse_launch.sh @@ -85,7 +85,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null -/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions 2>&1 >/dev/null +/chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions >/dev/null 2>&1 /usr/bin/bash /machinaris/scripts/gpu_drivers_setup.sh @@ -117,7 +117,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.chia/farmer_ca/chia_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then /chia-gigahorse-farmer/chia.bin init -c /root/.chia/farmer_ca 2>&1 > /root/.chia/mainnet/log/init.log chmod 755 -R /root/.chia/mainnet/config/ssl/ &> /dev/null - /chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions 2>&1 >/dev/null + /chia-gigahorse-farmer/chia.bin init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.chia/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/gold_launch.sh b/scripts/forks/gold_launch.sh index 73066e95..11df22bc 100644 --- a/scripts/forks/gold_launch.sh +++ b/scripts/forks/gold_launch.sh @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.gold/mainnet/config/ssl/ &> /dev/null -gold init --fix-ssl-permissions 2>&1 >/dev/null +gold init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.gold/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then gold init -c /root/.gold/farmer_ca 2>&1 > /root/.gold/mainnet/log/init.log chmod 755 -R /root/.gold/mainnet/config/ssl/ &> /dev/null - gold init --fix-ssl-permissions 2>&1 >/dev/null + gold init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.gold/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/greenbtc_launch.sh b/scripts/forks/greenbtc_launch.sh index 260dbcac..fc50d7b2 100644 --- a/scripts/forks/greenbtc_launch.sh +++ b/scripts/forks/greenbtc_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.greenbtc/mainnet/config/ssl/ &> /dev/null -greenbtc init --fix-ssl-permissions 2>&1 >/dev/null +greenbtc init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.greenbtc/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then greenbtc init -c /root/.greenbtc/farmer_ca 2>&1 > /root/.greenbtc/mainnet/log/init.log chmod 755 -R /root/.greenbtc/mainnet/config/ssl/ &> /dev/null - greenbtc init --fix-ssl-permissions 2>&1 >/dev/null + greenbtc init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.greenbtc/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/hddcoin_launch.sh b/scripts/forks/hddcoin_launch.sh index 5ae090ab..33b2c74b 100644 --- a/scripts/forks/hddcoin_launch.sh +++ b/scripts/forks/hddcoin_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.hddcoin/mainnet/config/ssl/ &> /dev/null -hddcoin init --fix-ssl-permissions 2>&1 >/dev/null +hddcoin init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.hddcoin/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then hddcoin init -c /root/.hddcoin/farmer_ca 2>&1 > /root/.hddcoin/mainnet/log/init.log chmod 755 -R /root/.hddcoin/mainnet/config/ssl/ &> /dev/null - hddcoin init --fix-ssl-permissions 2>&1 >/dev/null + hddcoin init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.hddcoin/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/littlelambocoin_launch.sh b/scripts/forks/littlelambocoin_launch.sh index 11477f95..e7341d7b 100644 --- a/scripts/forks/littlelambocoin_launch.sh +++ b/scripts/forks/littlelambocoin_launch.sh @@ -55,7 +55,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.littlelambocoin/mainnet/config/ssl/ &> /dev/null -littlelambocoin init --fix-ssl-permissions 2>&1 >/dev/null +littlelambocoin init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -107,7 +107,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.littlelambocoin/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then littlelambocoin init -c /root/.littlelambocoin/farmer_ca 2>&1 > /root/.littlelambocoin/mainnet/log/init.log chmod 755 -R /root/.littlelambocoin/mainnet/config/ssl/ &> /dev/null - littlelambocoin init --fix-ssl-permissions 2>&1 >/dev/null + littlelambocoin init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.littlelambocoin/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/maize_launch.sh b/scripts/forks/maize_launch.sh index a897dfbc..b25f2d70 100644 --- a/scripts/forks/maize_launch.sh +++ b/scripts/forks/maize_launch.sh @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.maize/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then maize init -c /root/.maize/farmer_ca 2>&1 > /root/.maize/mainnet/log/init.log #chmod 755 -R /root/.maize/mainnet/config/ssl/ &> /dev/null - #maize init --fix-ssl-permissions 2>&1 >/dev/null + #maize init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.maize/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/mint_launch.sh b/scripts/forks/mint_launch.sh index a3f2b6c0..427026b2 100644 --- a/scripts/forks/mint_launch.sh +++ b/scripts/forks/mint_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.mint/mainnet/config/ssl/ &> /dev/null -mint init --fix-ssl-permissions 2>&1 >/dev/null +mint init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.mint/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then mint init -c /root/.mint/farmer_ca 2>&1 > /root/.mint/mainnet/log/init.log chmod 755 -R /root/.mint/mainnet/config/ssl/ &> /dev/null - mint init --fix-ssl-permissions 2>&1 >/dev/null + mint init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.mint/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/nchain_launch.sh b/scripts/forks/nchain_launch.sh index 4e5b8859..718c2a04 100644 --- a/scripts/forks/nchain_launch.sh +++ b/scripts/forks/nchain_launch.sh @@ -50,7 +50,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.chia/ext9/config/ssl/ &> /dev/null -chia init --fix-ssl-permissions 2>&1 >/dev/null +chia init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -102,7 +102,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.ext9/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then chia init -c /root/.ext9/farmer_ca 2>&1 > /root/.chia/ext9/log/init.log chmod 755 -R /root/.chia/ext9/config/ssl/ &> /dev/null - chia init --fix-ssl-permissions 2>&1 >/dev/null + chia init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.ext9/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/one_launch.sh b/scripts/forks/one_launch.sh index 1cdf863b..5c369fe5 100644 --- a/scripts/forks/one_launch.sh +++ b/scripts/forks/one_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.one/mainnet/config/ssl/ &> /dev/null -one init --fix-ssl-permissions 2>&1 >/dev/null +one init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.one/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then one init -c /root/.one/farmer_ca 2>&1 > /root/.one/mainnet/log/init.log chmod 755 -R /root/.one/mainnet/config/ssl/ &> /dev/null - one init --fix-ssl-permissions 2>&1 >/dev/null + one init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.one/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/petroleum_launch.sh b/scripts/forks/petroleum_launch.sh index a93f598a..817c23e8 100644 --- a/scripts/forks/petroleum_launch.sh +++ b/scripts/forks/petroleum_launch.sh @@ -50,7 +50,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.petroleum/mainnet/config/ssl/ &> /dev/null -petroleum init --fix-ssl-permissions 2>&1 >/dev/null +petroleum init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -102,7 +102,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.petroleum/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then petroleum init -c /root/.petroleum/farmer_ca 2>&1 > /root/.petroleum/mainnet/log/init.log chmod 755 -R /root/.petroleum/mainnet/config/ssl/ &> /dev/null - petroleum init --fix-ssl-permissions 2>&1 >/dev/null + petroleum init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.petroleum/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/pipscoin_launch.sh b/scripts/forks/pipscoin_launch.sh index 65e535b0..2f599a7f 100644 --- a/scripts/forks/pipscoin_launch.sh +++ b/scripts/forks/pipscoin_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.pipscoin/mainnet/config/ssl/ &> /dev/null -pipscoin init --fix-ssl-permissions 2>&1 >/dev/null +pipscoin init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.pipscoin/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then pipscoin init -c /root/.pipscoin/farmer_ca 2>&1 > /root/.pipscoin/mainnet/log/init.log chmod 755 -R /root/.pipscoin/mainnet/config/ssl/ &> /dev/null - pipscoin init --fix-ssl-permissions 2>&1 >/dev/null + pipscoin init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.pipscoin/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/profit_launch.sh b/scripts/forks/profit_launch.sh index 2ebb0da9..ab3d6d0a 100644 --- a/scripts/forks/profit_launch.sh +++ b/scripts/forks/profit_launch.sh @@ -49,7 +49,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.profit/mainnet/config/ssl/ &> /dev/null -profit init --fix-ssl-permissions 2>&1 >/dev/null +profit init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -101,7 +101,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.profit/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then profit init -c /root/.profit/farmer_ca 2>&1 > /root/.profit/mainnet/log/init.log chmod 755 -R /root/.profit/mainnet/config/ssl/ &> /dev/null - profit init --fix-ssl-permissions 2>&1 >/dev/null + profit init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.profit/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/shibgreen_launch.sh b/scripts/forks/shibgreen_launch.sh index 1b815148..76cb0416 100644 --- a/scripts/forks/shibgreen_launch.sh +++ b/scripts/forks/shibgreen_launch.sh @@ -54,7 +54,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.shibgreen/mainnet/config/ssl/ &> /dev/null -shibgreen init --fix-ssl-permissions 2>&1 >/dev/null +shibgreen init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -106,7 +106,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.shibgreen/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then shibgreen init -c /root/.shibgreen/farmer_ca 2>&1 > /root/.shibgreen/mainnet/log/init.log chmod 755 -R /root/.shibgreen/mainnet/config/ssl/ &> /dev/null - shibgreen init --fix-ssl-permissions 2>&1 >/dev/null + shibgreen init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.shibgreen/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/silicoin_launch.sh b/scripts/forks/silicoin_launch.sh index 27b5ffc0..1759db89 100644 --- a/scripts/forks/silicoin_launch.sh +++ b/scripts/forks/silicoin_launch.sh @@ -68,7 +68,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.sit/mainnet/config/ssl/ &> /dev/null -sit init --fix-ssl-permissions 2>&1 >/dev/null +sit init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -120,7 +120,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.sit/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then sit init -c /root/.sit/farmer_ca 2>&1 > /root/.sit/mainnet/log/init.log chmod 755 -R /root/.sit/mainnet/config/ssl/ &> /dev/null - sit init --fix-ssl-permissions 2>&1 >/dev/null + sit init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.sit/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/staicoin_launch.sh b/scripts/forks/staicoin_launch.sh index 2d6373b0..91c19aa0 100644 --- a/scripts/forks/staicoin_launch.sh +++ b/scripts/forks/staicoin_launch.sh @@ -60,7 +60,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.stai/mainnet/config/ssl/ &> /dev/null -stai init --fix-ssl-permissions 2>&1 >/dev/null +stai init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -112,7 +112,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.stai/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then stai init -c /root/.stai/farmer_ca 2>&1 > /root/.stai/mainnet/log/init.log chmod 755 -R /root/.stai/mainnet/config/ssl/ &> /dev/null - stai init --fix-ssl-permissions 2>&1 >/dev/null + stai init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.stai/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/stor_launch.sh b/scripts/forks/stor_launch.sh index fb21c59d..dce396f9 100644 --- a/scripts/forks/stor_launch.sh +++ b/scripts/forks/stor_launch.sh @@ -56,7 +56,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.stor/mainnet/config/ssl/ &> /dev/null -stor init --fix-ssl-permissions 2>&1 >/dev/null +stor init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -108,7 +108,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.stor/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then stor init -c /root/.stor/farmer_ca 2>&1 > /root/.stor/mainnet/log/init.log chmod 755 -R /root/.stor/mainnet/config/ssl/ &> /dev/null - stor init --fix-ssl-permissions 2>&1 >/dev/null + stor init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.stor/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/tad_launch.sh b/scripts/forks/tad_launch.sh index 0e24167e..5ec3f947 100644 --- a/scripts/forks/tad_launch.sh +++ b/scripts/forks/tad_launch.sh @@ -56,7 +56,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.tad/mainnet/config/ssl/ &> /dev/null -tad init --fix-ssl-permissions 2>&1 >/dev/null +tad init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -108,7 +108,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.tad/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then tad init -c /root/.tad/farmer_ca 2>&1 > /root/.tad/mainnet/log/init.log chmod 755 -R /root/.tad/mainnet/config/ssl/ &> /dev/null - tad init --fix-ssl-permissions 2>&1 >/dev/null + tad init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.tad/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" diff --git a/scripts/forks/wheat_launch.sh b/scripts/forks/wheat_launch.sh index a7c825cd..0875b833 100644 --- a/scripts/forks/wheat_launch.sh +++ b/scripts/forks/wheat_launch.sh @@ -51,7 +51,7 @@ for p in ${plots_dir//:/ }; do done chmod 755 -R /root/.wheat/mainnet/config/ssl/ &> /dev/null -wheat init --fix-ssl-permissions 2>&1 >/dev/null +wheat init --fix-ssl-permissions >/dev/null 2>&1 # Start services based on mode selected. Default is 'fullnode' if [[ ${mode} =~ ^fullnode.* ]]; then @@ -103,7 +103,7 @@ elif [[ ${mode} =~ ^harvester.* ]]; then if [[ -f /root/.wheat/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then wheat init -c /root/.wheat/farmer_ca 2>&1 > /root/.wheat/mainnet/log/init.log chmod 755 -R /root/.wheat/mainnet/config/ssl/ &> /dev/null - wheat init --fix-ssl-permissions 2>&1 >/dev/null + wheat init --fix-ssl-permissions >/dev/null 2>&1 else echo "Did not find your farmer's certificates within /root/.wheat/farmer_ca." echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester" From 8b50c135eaa2ddd31ede0f5cb27d68cb3aa37f15 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Thu, 12 Oct 2023 09:33:03 -0600 Subject: [PATCH 10/10] Dealing with CNI now deleting their release tags for some reason. --- .github/workflows/develop-chia.yaml | 2 +- .github/workflows/main-chia.yaml | 2 +- .github/workflows/test-chia.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml index 716de3e0..8887b024 100644 --- a/.github/workflows/develop-chia.yaml +++ b/.github/workflows/develop-chia.yaml @@ -91,7 +91,7 @@ jobs: "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" "GIGAHORSE_BRANCH=v1.8.2.giga14" - "CHIA_BRANCH=release/1.8.3" + "CHIA_BRANCH=main" "MADMAX_BRANCH=v1.8.2.giga14" "PLOTMAN_BRANCH=compress" tags: | diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml index 83d561da..7141c226 100644 --- a/.github/workflows/main-chia.yaml +++ b/.github/workflows/main-chia.yaml @@ -91,7 +91,7 @@ jobs: "UBUNTU_VER=jammy" "MACHINARIS_STREAM=latest" "GIGAHORSE_BRANCH=v1.8.2.giga14" - "CHIA_BRANCH=release/1.8.1" + "CHIA_BRANCH=main" "MADMAX_BRANCH=v1.8.2.giga14" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml index 9fd0302c..c3baee5c 100644 --- a/.github/workflows/test-chia.yaml +++ b/.github/workflows/test-chia.yaml @@ -91,7 +91,7 @@ jobs: "MACHINARIS_STREAM=test" "CHIADOG_BRANCH=dev" "GIGAHORSE_BRANCH=v1.8.2.giga14" - "CHIA_BRANCH=release/1.8.1" + "CHIA_BRANCH=main" "PLOTMAN_BRANCH=development" tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test