From 252c1d350988e15d004e13ec2dbc63013a37c77a Mon Sep 17 00:00:00 2001 From: gStart9 <106188942+gStart9@users.noreply.github.com> Date: Mon, 3 Oct 2022 16:42:29 +0000 Subject: [PATCH] Touchups to blockchain copy guide (#177) * Touchups to blockchain copy guide * Boldings --- poetry.lock | 16 ++++++++-------- .../service-guides/bitcoin/blockchain-copy.rst | 16 ++++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/poetry.lock b/poetry.lock index e81ed73..f6b56ec 100644 --- a/poetry.lock +++ b/poetry.lock @@ -126,7 +126,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.12.0" +version = "5.0.0" description = "Read metadata from Python packages" category = "main" optional = false @@ -137,9 +137,9 @@ typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} zipp = ">=0.5" [package.extras] -docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"] +docs = ["sphinx (>=3.5)", "jaraco.packaging (>=9)", "rst.linker (>=1.9)", "furo", "jaraco.tidelift (>=1.4)"] perf = ["ipython"] -testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.3)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "flake8 (<5)", "pytest-cov", "pytest-enabler (>=1.3)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] [[package]] name = "jinja2" @@ -279,7 +279,7 @@ checkqa-mypy = ["mypy (==v0.761)"] [[package]] name = "pytz" -version = "2022.2.1" +version = "2022.4" description = "World timezone definitions, modern and historical" category = "main" optional = false @@ -721,8 +721,8 @@ imagesize = [ {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.12.0-py3-none-any.whl", hash = "sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23"}, - {file = "importlib_metadata-4.12.0.tar.gz", hash = "sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670"}, + {file = "importlib_metadata-5.0.0-py3-none-any.whl", hash = "sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43"}, + {file = "importlib_metadata-5.0.0.tar.gz", hash = "sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab"}, ] jinja2 = [ {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, @@ -808,8 +808,8 @@ pytest = [ {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, ] pytz = [ - {file = "pytz-2022.2.1-py2.py3-none-any.whl", hash = "sha256:220f481bdafa09c3955dfbdddb7b57780e9a94f5127e35456a48589b9e0c0197"}, - {file = "pytz-2022.2.1.tar.gz", hash = "sha256:cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5"}, + {file = "pytz-2022.4-py2.py3-none-any.whl", hash = "sha256:2c0784747071402c6e99f0bafdb7da0fa22645f06554c7ae06bf6358897e9c91"}, + {file = "pytz-2022.4.tar.gz", hash = "sha256:48ce799d83b6f8aab2020e369b627446696619e79645419610b9facd909b3174"}, ] pyyaml = [ {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, diff --git a/site/source/user-manual/service-guides/bitcoin/blockchain-copy.rst b/site/source/user-manual/service-guides/bitcoin/blockchain-copy.rst index 15ab03c..37b79e6 100644 --- a/site/source/user-manual/service-guides/bitcoin/blockchain-copy.rst +++ b/site/source/user-manual/service-guides/bitcoin/blockchain-copy.rst @@ -13,11 +13,15 @@ If you have already synced the Bitcoin blockchain to the tip on one Embassy, and .. note:: The following guide requires that you have already :ref:`setup SSH on both Embassies`. In this guide, we will refer to your synced Embassy as embassy-AAAAAAA.local and the Embassy with no Bitcoin synced as embassy-BBBBBBB.local. Of course, please replace AAAAAAA and BBBBBBB with your appropriate Embassies' names. -**Log into Embassy with synced blockchain** +**Install but don't start Bitcoin Core on the blockchain-less Embassy** -#. Stop the Bitcoin Core service on `https://embassy-AAAAAAA.local` (Services > Bitcoin Core > Stop) +#. Log into `https://embassy-BBBBBBB.local` and install Bitcoin Core (**Marketplace > Bitcoin > Bitcoin Core > Install**). Do *NOT* yet **CONFIGURE** or **START** Bitcoin Core. -#. :ref:`Open an ssh session ` to your Embassy with the synced chain (embassy-AAAAAAAA.local) +**Prep your Embassy with the synced blockchain** + +#. Stop the Bitcoin Core service on `https://embassy-AAAAAAA.local` (**Services > Bitcoin Core > Stop**) + +#. :ref:`Open an ssh session ` to embassy-AAAAAAAA.local #. Once at the shell, perform the following commands @@ -28,7 +32,7 @@ If you have already synced the Bitcoin blockchain to the tip on one Embassy, and chmod 600 .ssh/embassy2.key* cat .ssh/embassy2.key.pub -#. Copy the output from the cat command into embassy-BBBBBBB's **Embassy -> SSH -> Add New Key** text field: +#. Copy the output from the cat command into embassy-BBBBBBB's **Embassy > SSH > Add New Key** text field: .. figure:: /_static/images/walkthrough/ssh_key_add.jpg @@ -46,8 +50,8 @@ If you have already synced the Bitcoin blockchain to the tip on one Embassy, and rm .ssh/embassy2.key* exit -#. Log into `https://embassy-BBBBBBB.local` and install, configure, and then start your Bitcoin Core service. You should see it begin at 99%+ pre-synced. +#. Switch back to `https://embassy-BBBBBBB.local`, selecting **Services > Bitcoin Core**, **CONFIGURE**, configure it as desired, **SAVE** and then **START** your Bitcoin Core service. You should see it begin at 99%+ pre-synced. -#. You can now restart your Bitcoin Core service on `https://embassy-AAAAAAA.local` (Services > Bitcoin Core > Start) +#. You can now restart your Bitcoin Core service on `https://embassy-AAAAAAA.local` (**Services > Bitcoin Core > Start**) .. _bitcoin-service: \ No newline at end of file