diff --git a/deployment/remote.sh b/deployment/remote.sh index 2e28b5f..01d7d74 100755 --- a/deployment/remote.sh +++ b/deployment/remote.sh @@ -240,14 +240,14 @@ if ! lxc storage list --format csv | grep -q ss-base; then lxc storage create ss-base zfs fi - # create the testnet/mainnet blocks/chainstate subvolumes. - for CHAIN in mainnet testnet; do - for DATA in blocks chainstate; do - if ! lxc storage volume list ss-base | grep -q "$CHAIN-$DATA"; then - lxc storage volume create ss-base "$CHAIN-$DATA" --type=filesystem - fi - done - done + # # create the testnet/mainnet blocks/chainstate subvolumes. + # for CHAIN in mainnet testnet; do + # for DATA in blocks chainstate; do + # if ! lxc storage volume list ss-base | grep -q "$CHAIN-$DATA"; then + # lxc storage volume create ss-base "$CHAIN-$DATA" --type=filesystem + # fi + # done + # done else echo "WARNING! The host '$FQDN' appears to have Sovereign Stack worksloads already provisioned. Proceed with care." diff --git a/deployment/reset.sh b/deployment/reset.sh index eadeab7..31a1e94 100755 --- a/deployment/reset.sh +++ b/deployment/reset.sh @@ -63,14 +63,14 @@ if [ "$PURGE_LXD" = true ]; then lxc network delete lxdbr1 --project default fi - # create the testnet/mainnet blocks/chainstate subvolumes. - for CHAIN in mainnet testnet; do - for DATA in blocks chainstate; do - if lxc storage volume list ss-base | grep -q "$CHAIN-$DATA"; then - lxc storage volume delete ss-base "$CHAIN-$DATA" - fi - done - done + # # create the testnet/mainnet blocks/chainstate subvolumes. + # for CHAIN in mainnet testnet; do + # for DATA in blocks chainstate; do + # if lxc storage volume list ss-base | grep -q "$CHAIN-$DATA"; then + # lxc storage volume delete ss-base "$CHAIN-$DATA" + # fi + # done + # done if lxc storage list --format csv | grep -q ss-base; then lxc storage delete ss-base diff --git a/install.sh b/install.sh index 29f5a98..99adaf1 100755 --- a/install.sh +++ b/install.sh @@ -103,39 +103,39 @@ if ! lxc config device show ss-mgmt | grep -q ss-root; then lxc config device add ss-mgmt ss-root disk source="$SS_ROOT_PATH" path=/home/ubuntu/.ss fi -# if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. -BITCOIN_DIR="$HOME/.bitcoin" -REMOTE_BITCOIN_CACHE_PATH="/home/ubuntu/.ss/cache/bitcoin" -BITCOIN_TESTNET_BLOCKS_PATH="$BITCOIN_DIR/testnet3/blocks" -if [ -d "$BITCOIN_TESTNET_BLOCKS_PATH" ]; then - if ! lxc config device show ss-mgmt | grep -q ss-testnet-blocks; then - lxc config device add ss-mgmt ss-testnet-blocks disk source="$BITCOIN_TESTNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/blocks - fi -fi +# # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. +# BITCOIN_DIR="$HOME/.bitcoin" +# REMOTE_BITCOIN_CACHE_PATH="/home/ubuntu/.ss/cache/bitcoin" +# BITCOIN_TESTNET_BLOCKS_PATH="$BITCOIN_DIR/testnet3/blocks" +# if [ -d "$BITCOIN_TESTNET_BLOCKS_PATH" ]; then +# if ! lxc config device show ss-mgmt | grep -q ss-testnet-blocks; then +# lxc config device add ss-mgmt ss-testnet-blocks disk source="$BITCOIN_TESTNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/blocks +# fi +# fi - # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. -BITCOIN_TESTNET_CHAINSTATE_PATH="$BITCOIN_DIR/testnet3/chainstate" -if [ -d "$BITCOIN_TESTNET_CHAINSTATE_PATH" ]; then - if ! lxc config device show ss-mgmt | grep -q ss-testnet-chainstate; then - lxc config device add ss-mgmt ss-testnet-chainstate disk source="$BITCOIN_TESTNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/chainstate - fi -fi +# # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. +# BITCOIN_TESTNET_CHAINSTATE_PATH="$BITCOIN_DIR/testnet3/chainstate" +# if [ -d "$BITCOIN_TESTNET_CHAINSTATE_PATH" ]; then +# if ! lxc config device show ss-mgmt | grep -q ss-testnet-chainstate; then +# lxc config device add ss-mgmt ss-testnet-chainstate disk source="$BITCOIN_TESTNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/testnet/chainstate +# fi +# fi -# if a ~/.bitcoin/blocks dir exists, mount it in. -BITCOIN_MAINNET_BLOCKS_PATH="$BITCOIN_DIR/blocks" -if [ -d "$BITCOIN_MAINNET_BLOCKS_PATH" ]; then - if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then - lxc config device add ss-mgmt ss-mainnet-blocks disk source="$BITCOIN_MAINNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/blocks - fi -fi +# # if a ~/.bitcoin/blocks dir exists, mount it in. +# BITCOIN_MAINNET_BLOCKS_PATH="$BITCOIN_DIR/blocks" +# if [ -d "$BITCOIN_MAINNET_BLOCKS_PATH" ]; then +# if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then +# lxc config device add ss-mgmt ss-mainnet-blocks disk source="$BITCOIN_MAINNET_BLOCKS_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/blocks +# fi +# fi - # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. -BITCOIN_MAINNET_CHAINSTATE_PATH="$BITCOIN_DIR/chainstate" -if [ -d "$BITCOIN_MAINNET_CHAINSTATE_PATH" ]; then - if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then - lxc config device add ss-mgmt ss-mainnet-chainstate disk source="$BITCOIN_MAINNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/chainstate - fi -fi +# # if a ~/.bitcoin/testnet3/blocks direrectory exists, mount it in. +# BITCOIN_MAINNET_CHAINSTATE_PATH="$BITCOIN_DIR/chainstate" +# if [ -d "$BITCOIN_MAINNET_CHAINSTATE_PATH" ]; then +# if ! lxc config device show ss-mgmt | grep -q ss-mainnet-blocks; then +# lxc config device add ss-mgmt ss-mainnet-chainstate disk source="$BITCOIN_MAINNET_CHAINSTATE_PATH" path=$REMOTE_BITCOIN_CACHE_PATH/mainnet/chainstate +# fi +# fi # mount the ssh directory in there. if [ -f "$SSH_PUBKEY_PATH" ]; then