From 836b4aaedc2414d0d96d3a55756eecade1a83a6d Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Tue, 14 Sep 2021 17:04:13 -0600 Subject: [PATCH 01/13] Versioning init --- README.md | 3 ++- source/_templates/versioning.html | 8 ++++++++ source/conf.py | 18 ++++++++++++++++-- source/support/FAQ/dev-faq.rst | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 source/_templates/versioning.html diff --git a/README.md b/README.md index 8d53fc4..00b2e14 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ brew install sphinx-doc pip3 install sphinx-autobuild pip3 install sphinx-book-theme || pip install git+https://github.com/executablebooks/sphinx-book-theme.git@master pip3 install sphinxcontrib.yt +pip3 install sphinx-multiversion ``` ### Development @@ -56,4 +57,4 @@ To update Sphinx Book Theme: - `pip install sphinx-book-theme==` || `pip install git+https://github.com/executablebooks/sphinx-book-theme.git@` eg. `pip install sphinx-book-theme==0.0.42` To deploy theme update: -- Build and publish according to production release process \ No newline at end of file +- Build and publish according to production release process diff --git a/source/_templates/versioning.html b/source/_templates/versioning.html new file mode 100644 index 0000000..ef74ed4 --- /dev/null +++ b/source/_templates/versioning.html @@ -0,0 +1,8 @@ +{% if versions %} +

{{ _('Versions') }}

+ +{% endif %} \ No newline at end of file diff --git a/source/conf.py b/source/conf.py index 85ae9e5..f5ac275 100644 --- a/source/conf.py +++ b/source/conf.py @@ -25,18 +25,31 @@ copyright = '2021, Start9 Labs, Inc' # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'sphinxcontrib.yt' + 'sphinxcontrib.yt', + 'sphinx_multiversion' # 'sphinxcontrib.needs' ] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] +# HTML sidebar widgets +# html_sidebars = { +# '**': [ +# 'versioning.html', +# ], +# } + # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. exclude_patterns = [] +# Multiversion settings +smv_tag_whitelist = 'None' +smv_prefer_remote_refs = True +# smv_branch_whitelist = master + # -- Options for HTML output ------------------------------------------------- @@ -56,12 +69,13 @@ html_theme_options = { # "theme_dev_mode": True, "path_to_docs": "source", "repository_url": "https://github.com/Start9Labs/documentation", + "repository_branch": "master", "use_edit_page_button": True, "use_issues_button": True, "use_repository_button": True, "extra_navbar": "Powered by Start9", # Will be displayed underneath the left navbar" "show_navbar_depth": 1, - "use_download_button": False, + "use_download_button": True, "use_edit_page_button": True, "launch_buttons": { "main_site": "https://start9.com", diff --git a/source/support/FAQ/dev-faq.rst b/source/support/FAQ/dev-faq.rst index 4792f4e..fe386e7 100644 --- a/source/support/FAQ/dev-faq.rst +++ b/source/support/FAQ/dev-faq.rst @@ -22,7 +22,7 @@ With sufficient effort, most any software with the ability to be self-hosted cou - Already 'dockerized' Which possible formats can I use to write the :code:`manifest`, :code:`config_spec`, and :code:`config_rules` files? ---------------------------------------------------------------------------------------------------------------------- +-------------------------------------------------------------------------------------------------------------------- JSON, TOML, or YAML are valid options. I'm getting errors on the `embassy-sdk pack` step. What's going on? From b1113d020afe2abdd2e86e55125e08fb45a99557 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Mon, 27 Sep 2021 09:38:12 -0600 Subject: [PATCH 02/13] Versioning --- source/conf.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/conf.py b/source/conf.py index f5ac275..af7305f 100644 --- a/source/conf.py +++ b/source/conf.py @@ -35,9 +35,7 @@ templates_path = ['_templates'] # HTML sidebar widgets # html_sidebars = { -# '**': [ -# 'versioning.html', -# ], +# "**": ["versioning.html"], # } # List of patterns, relative to source directory, that match files and @@ -46,10 +44,14 @@ templates_path = ['_templates'] exclude_patterns = [] # Multiversion settings -smv_tag_whitelist = 'None' -smv_prefer_remote_refs = True -# smv_branch_whitelist = master +# smv_tag_whitelist = None +# smv_branch_whitelist = None +# smv_prefer_remote_refs = True +# Versions = { +# "v0.2.x" : "https://github.com/Start9Labs/documentation", +# "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates" +# } # -- Options for HTML output ------------------------------------------------- From 07b5a75aa41a75da20b6393e1b33ad0574e0f9f2 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Wed, 20 Oct 2021 14:36:31 -0600 Subject: [PATCH 03/13] Added FAQ --- source/support/FAQ/setup-faq.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/support/FAQ/setup-faq.rst b/source/support/FAQ/setup-faq.rst index 889b0a5..5df87fe 100644 --- a/source/support/FAQ/setup-faq.rst +++ b/source/support/FAQ/setup-faq.rst @@ -58,4 +58,8 @@ This has been fixed in newer updates. Please first make sure to update to the l Is it true that iOS has some limited functionality in regard to the Embassy? ---------------------------------------------------------------------------- -The short answer is yes, but not much. Unfortunately, Apple does not allow any ability for Tor to run in the background (everything on the Embassy runs over Tor). Most of your Embassy services can be run with Tor-native apps, inside Consulate, or with another Tor browser, with the exception of RTL, Spark, and Matrix. Zap and Zeus wallets can be used in place of RTL/Spark, and we hope a Tor-native Element client will be available soon to allow for the use of Matrix. \ No newline at end of file +The short answer is yes, but not much. Unfortunately, Apple does not allow any ability for Tor to run in the background (everything on the Embassy runs over Tor). Most of your Embassy services can be run with Tor-native apps, inside Consulate, or with another Tor browser, with the exception of RTL, Spark, and Matrix. Zap and Zeus wallets can be used in place of RTL/Spark, and we hope a Tor-native Element client will be available soon to allow for the use of Matrix. + +I'm having trouble using Firefox for Tor addresses on Lineage, what can I do? +----------------------------------------------------------------------------- +Unfortunately, there seems to be a bug in Lineage that makes using Firefox over Tor currently unusable. Currently, this feature works fine on Calyx and Graphene. From a6a7182950529427dfb98b405f4fc8b3af3b7b17 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Tue, 14 Sep 2021 17:04:13 -0600 Subject: [PATCH 04/13] Versioning init --- source/conf.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source/conf.py b/source/conf.py index af7305f..4953ba5 100644 --- a/source/conf.py +++ b/source/conf.py @@ -35,7 +35,13 @@ templates_path = ['_templates'] # HTML sidebar widgets # html_sidebars = { +<<<<<<< HEAD # "**": ["versioning.html"], +======= +# '**': [ +# 'versioning.html', +# ], +>>>>>>> c566da4 (Versioning init) # } # List of patterns, relative to source directory, that match files and @@ -44,6 +50,7 @@ templates_path = ['_templates'] exclude_patterns = [] # Multiversion settings +<<<<<<< HEAD # smv_tag_whitelist = None # smv_branch_whitelist = None # smv_prefer_remote_refs = True @@ -52,6 +59,12 @@ exclude_patterns = [] # "v0.2.x" : "https://github.com/Start9Labs/documentation", # "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates" # } +======= +smv_tag_whitelist = 'None' +smv_prefer_remote_refs = True +# smv_branch_whitelist = master + +>>>>>>> c566da4 (Versioning init) # -- Options for HTML output ------------------------------------------------- From 365ce8e9922ead668bb88437df1d6662b71306e2 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Thu, 21 Oct 2021 14:07:06 -0600 Subject: [PATCH 05/13] Minor FAQ edit --- source/support/FAQ/dev-faq.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/support/FAQ/dev-faq.rst b/source/support/FAQ/dev-faq.rst index fe386e7..64a2708 100644 --- a/source/support/FAQ/dev-faq.rst +++ b/source/support/FAQ/dev-faq.rst @@ -17,8 +17,8 @@ What considerations go into selecting an application to package? With sufficient effort, most any software with the ability to be self-hosted could make its way onto EmbassyOS. That being said, the following features will make service packaging much easier: - Already built with self-hosting in mind -- Active development -- Built-in tor support +- Active development / community +- Native proxy/tor support - Already 'dockerized' Which possible formats can I use to write the :code:`manifest`, :code:`config_spec`, and :code:`config_rules` files? @@ -29,4 +29,3 @@ I'm getting errors on the `embassy-sdk pack` step. What's going on? -------------------------------------------------------------------- There is something either missing or incorrect in regard to one of the :code:`manifest`, :code:`configs`, :code:`instructions`, or :code:`icon` files. - From 8bbaeaca42f3a4bcec6fd84771e9ab1a4ac1cea2 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Thu, 21 Oct 2021 14:34:22 -0600 Subject: [PATCH 06/13] ? --- source/conf.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/source/conf.py b/source/conf.py index 4953ba5..ce0946a 100644 --- a/source/conf.py +++ b/source/conf.py @@ -35,13 +35,10 @@ templates_path = ['_templates'] # HTML sidebar widgets # html_sidebars = { -<<<<<<< HEAD # "**": ["versioning.html"], -======= # '**': [ # 'versioning.html', # ], ->>>>>>> c566da4 (Versioning init) # } # List of patterns, relative to source directory, that match files and @@ -50,7 +47,6 @@ templates_path = ['_templates'] exclude_patterns = [] # Multiversion settings -<<<<<<< HEAD # smv_tag_whitelist = None # smv_branch_whitelist = None # smv_prefer_remote_refs = True @@ -59,12 +55,10 @@ exclude_patterns = [] # "v0.2.x" : "https://github.com/Start9Labs/documentation", # "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates" # } -======= smv_tag_whitelist = 'None' smv_prefer_remote_refs = True # smv_branch_whitelist = master ->>>>>>> c566da4 (Versioning init) # -- Options for HTML output ------------------------------------------------- From a140307ca3f7cc5e2fb5195161df85ca005efe57 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Thu, 18 Nov 2021 08:59:18 -0700 Subject: [PATCH 07/13] base versioning configuration --- README.md | 4 ++++ source/_templates/layout.html | 2 +- source/_templates/versioning.html | 17 +++++++++++----- source/conf.py | 34 ++++++++++++++++--------------- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 00b2e14..e7bf97d 100644 --- a/README.md +++ b/README.md @@ -58,3 +58,7 @@ To update Sphinx Book Theme: To deploy theme update: - Build and publish according to production release process + +## Versioning +- Build for versioning: `sphinx-multiversion source build/html` +- To view version metadata: `sphinx-multiversion source build/html --dump-metadata` \ No newline at end of file diff --git a/source/_templates/layout.html b/source/_templates/layout.html index 7fc2b2d..3fbeb16 100644 --- a/source/_templates/layout.html +++ b/source/_templates/layout.html @@ -11,4 +11,4 @@ -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/source/_templates/versioning.html b/source/_templates/versioning.html index ef74ed4..2c7eb3f 100644 --- a/source/_templates/versioning.html +++ b/source/_templates/versioning.html @@ -1,8 +1,15 @@ {% if versions %} -

{{ _('Versions') }}

+

{{ _('Branches') }}

-{% endif %} \ No newline at end of file +

{{ _('Tags') }}

+ +{% endif %} +

*testing versions*

\ No newline at end of file diff --git a/source/conf.py b/source/conf.py index ce0946a..2eeef84 100644 --- a/source/conf.py +++ b/source/conf.py @@ -34,12 +34,9 @@ extensions = [ templates_path = ['_templates'] # HTML sidebar widgets -# html_sidebars = { -# "**": ["versioning.html"], -# '**': [ -# 'versioning.html', -# ], -# } +html_sidebars = { + "**": ["sidebar-logo.html", "search-field.html", "versioning.html", "sbt-sidebar-nav.html", "sbt-sidebar-footer.html"] +} # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. @@ -47,18 +44,23 @@ templates_path = ['_templates'] exclude_patterns = [] # Multiversion settings -# smv_tag_whitelist = None -# smv_branch_whitelist = None -# smv_prefer_remote_refs = True +# Whitelist pattern for tags (set to None to ignore all tags) +smv_tag_whitelist = r'^v\d+\.\d+$' # Include tags like "v2.1" -# Versions = { -# "v0.2.x" : "https://github.com/Start9Labs/documentation", -# "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates" -# } -smv_tag_whitelist = 'None' +# Whitelist pattern for branches (set to None to ignore all branches) +smv_branch_whitelist = r'^.*$' + +# Whitelist pattern for remotes (set to None to use local branches only) +smv_remote_whitelist = r'^(origin)$' + +# Pattern for released versions +smv_released_pattern = r'^tags/.*$' + +# Format for versioned output directories inside the build directory +smv_outputdir_format = 'versions/{ref.name}' + +# Determines whether remote or local git branches/tags are preferred if their output dirs conflict smv_prefer_remote_refs = True -# smv_branch_whitelist = master - # -- Options for HTML output ------------------------------------------------- From 4ddea261a904a87164fe8c4a104fa6864fc25adb Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Tue, 14 Sep 2021 17:04:13 -0600 Subject: [PATCH 08/13] Versioning init --- README.md | 4 ++-- source/_templates/versioning.html | 2 +- source/conf.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e7bf97d..73ec6fa 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Click on the "Issues" tab in the top navbar. Provide a good title and describe c ### Submitting a pull request -Click on the "Pull requests" tab in the top navbar. Select the green "New pull request button" in the top right section. Select your branch for the compare dropdown, and master as the base. Provide an appropriate title and summary of the changes in the pull request description. Changes will be reviewed and merged when satisfactory. +Click on the "Pull requests" tab in the top navbar. Select the green "New pull request button" in the top right section. Select your branch for the compare dropdown, and master as the base. Provide an appropriate title and summary of the changes in the pull request description. Changes will be reviewed and merged when satisfactory. ## Helpful Resources @@ -61,4 +61,4 @@ To deploy theme update: ## Versioning - Build for versioning: `sphinx-multiversion source build/html` -- To view version metadata: `sphinx-multiversion source build/html --dump-metadata` \ No newline at end of file +- To view version metadata: `sphinx-multiversion source build/html --dump-metadata` diff --git a/source/_templates/versioning.html b/source/_templates/versioning.html index 2c7eb3f..50d90d0 100644 --- a/source/_templates/versioning.html +++ b/source/_templates/versioning.html @@ -12,4 +12,4 @@ {%- endfor %} {% endif %} -

*testing versions*

\ No newline at end of file +

*testing versions*

diff --git a/source/conf.py b/source/conf.py index 2eeef84..46759a5 100644 --- a/source/conf.py +++ b/source/conf.py @@ -100,4 +100,4 @@ html_js_files = [ ] html_cs_files = [ 'default.css' -] \ No newline at end of file +] From 8b8edb6ddee38972d757e96eeddd8228296ebfce Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Tue, 30 Nov 2021 11:31:00 -0700 Subject: [PATCH 09/13] DIY updates --- source/getting-started/diy.rst | 96 +++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 20 deletions(-) diff --git a/source/getting-started/diy.rst b/source/getting-started/diy.rst index ee5a478..4a98728 100644 --- a/source/getting-started/diy.rst +++ b/source/getting-started/diy.rst @@ -12,8 +12,7 @@ DIY Guide By popular demand, we are pleased to present this "Do it Yourself" (DIY) guide for the Start9 Embassy personal server! -.. warning:: This DIY guide is for EmbassyOS version 0.2.13. A substantive change will be made to this guide for EmbassyOS v0.3.0 scheduled for release in Q3 2021. When 0.3.0 launches it will REQUIRE hardware updates, which you can find `here `__. - +.. warning:: This DIY guide has directions for EmbassyOS versions 0.2.x and versions 0.3.x. When 0.3.0 launches it will REQUIRE hardware updates, which you can find `here `__. Please keep in mind that version 0.3.x is not yet available for purchase!! Please stay tuned to our community channels for updates. Motivation @@ -31,13 +30,11 @@ There are four reasons you might prefer to build your own Embassy instead of pur #. You just like building things. -Hardware -======== +Building EmbassyOS Versions 0.2.x +================================= -Components (EmbassyOS versions 0.2.x) -------------------------------------- - -.. note:: For newer versions of EmbassyOS (0.3.0 and above), please see the new hardware requirements `here `__. These pieces are *in addition* to the hardware below. +Hardware: Components +-------------------- #. `Raspberry Pi 4B (8GB) `_ #. `Power supply for Raspberry Pi 4B `_ @@ -45,12 +42,12 @@ Components (EmbassyOS versions 0.2.x) #. `High endurance microSD `_ (recommended 128GB or more) #. `GPIO mini speaker/buzzer `_ (These often sell out, please let us know if this link needs to be refreshed) #. Ethernet cable -#. MicroSD → USB adapter (if no microSD port on your computer) +#. MicroSD → USB adapter (or you may have a microSD port on your computer) `*` If you use a fan, **DO NOT** use the official Raspberry Pi fan, as it requires the same GPIO pins as the audio speaker. Instead, we recommend `this fan `_. -Assembly Instructions ---------------------- +Hardware: Assembly Instructions +------------------------------- #. Insert mini speaker/buzzer into GPIO pins 6/8/10/12 with the word "speaker" facing out, `away from the board`. @@ -60,18 +57,15 @@ Assembly Instructions That's it. Place the Raspberry Pi 4 board (with speaker attached), into its case. -Getting EmbassyOS -================= - -Purchasing ----------- +Getting EmbassyOS: Purchasing +----------------------------- You can purchase EmbassyOS `here `_. This is by far the easiest path to get up and running. Depending on your Internet speed, the download should take between 5 and 30 minutes. -Building from Source --------------------- +Getting EmbassyOS: Building from Source +--------------------------------------- If you have the proper tooling and are comfortable using the command line, you can build EmbassyOS from `source `_, which is made available under the `Start9 Personal Use License `_. @@ -81,7 +75,7 @@ Thanks to our community members who have kindly put together these guides! * A technically focused guide by `t0mmysm1th `_ Installing EmbassyOS -==================== +-------------------- Whether you purchase EmbassyOS from us or build it yourself, you need to flash it onto a microSD card. @@ -96,7 +90,69 @@ Whether you purchase EmbassyOS from us or build it yourself, you need to flash i :width: 60% :alt: Balena Etcher Dashboard -#. Once the image is flashed and verified, you may remove the micro SD and insert it into your Embassy. +#. Once the image is flashed and verified, you may remove the micro SD, insert it into your Embassy, and power up the device. +#. The Embassy is now ready for use, and you may following the normal :ref:`setup ` instructions. ``*`` + +``*`` The first time you power it on, your Embassy will make more noises than future attempts, and it may take several minutes to finally complete. + +Building EmbassyOS Versions 0.3.x +================================= + +Hardware: Components +-------------------- + +#. `Raspberry Pi 4B (8GB) `_ +#. `Power supply for Raspberry Pi 4B `_ Make sure this is at minimum 15w and 3.5a. +#. Case for Raspberry Pi 4B (`passive cooling recommended `_ `*`) +#. A `16GB microSD card `_ (no need for bigger). If you have ABSOLUTELY NO data to migrate, you may choose to re-use the card already in your Embassy. +#. `GPIO mini speaker/buzzer `_ (These often sell out, please let us know if this link needs to be refreshed) +#. Ethernet cable +#. MicroSD → USB adapter (or you may have a microSD port on your computer) +#. An external drive (1TB minimum, 2TB SSD recommended), or an `internal drive `_ with an `USB enclosure `_, as sold with our upgrade kits. MUST CONNECT OVER USB 3.0 + +`*` If you use a fan, **DO NOT** use the official Raspberry Pi fan, as it requires the same GPIO pins as the audio speaker. Instead, we recommend `this fan `_. + +Hardware: Assembly Instructions +------------------------------- + +#. Insert mini speaker/buzzer into GPIO pins 6/8/10/12 with the word "speaker" facing out, `away from the board`. + + .. figure:: /_static/images/diy/pins.png + :width: 60% + :alt: Speaker board spec + +#. Place the Raspberry Pi 4 board (with speaker attached), into its case. +#. Plug in the external drive to one of the USB 3.0 (blue) slots + +Getting EmbassyOS: Purchasing +----------------------------- + +You can purchase EmbassyOS `here `_. This is by far the easiest path to get up and running. + +Depending on your Internet speed, the download should take between 5 and 30 minutes. + +Getting EmbassyOS: Building from Source +--------------------------------------- + +A detailed build guide will be available around the time of the v0.3.0 release (or now, if you snoop around our GitHub long enough). + +Installing EmbassyOS +-------------------- + +Whether you purchase EmbassyOS from us or build it yourself, you need to flash it onto a microSD card. + +#. Download `balenaEtcher `_ onto your Mac, Windows, or Linux computer. +#. Insert the microSD card into your computer, either directly or using an adapter. +#. Open balenaEtcher. +#. Click `Select Image`, then find and select your copy of EmbassyOS. +#. Click `Select Target`, then find and select your micro SD card. +#. Click `Flash!` You may be asked to (1) approve the unusually large disk target or (2) enter your password. Both are normal. + + .. figure:: /_static/images/diy/balena.png + :width: 60% + :alt: Balena Etcher Dashboard + +#. Once the image is flashed and verified, you may remove the micro SD, insert it into your Embassy, and power up the device. #. The Embassy is now ready for use, and you may following the normal :ref:`setup ` instructions. ``*`` ``*`` The first time you power it on, your Embassy will make more noises than future attempts, and it may take several minutes to finally complete. From 828ecc6a22114c6d4876754954c0a02ac167d9d5 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Tue, 30 Nov 2021 11:32:29 -0700 Subject: [PATCH 10/13] Removed test for Master --- source/_templates/versioning.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_templates/versioning.html b/source/_templates/versioning.html index 50d90d0..a1d0902 100644 --- a/source/_templates/versioning.html +++ b/source/_templates/versioning.html @@ -12,4 +12,4 @@ {%- endfor %} {% endif %} -

*testing versions*

+ From 632e3d9ab3f13a7f28680e8570d996a1ef4eb693 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Tue, 30 Nov 2021 15:55:36 -0700 Subject: [PATCH 11/13] Minor edit --- source/getting-started/diy.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/getting-started/diy.rst b/source/getting-started/diy.rst index 4a98728..038e0c4 100644 --- a/source/getting-started/diy.rst +++ b/source/getting-started/diy.rst @@ -40,7 +40,7 @@ Hardware: Components #. `Power supply for Raspberry Pi 4B `_ #. Case for Raspberry Pi 4B (`passive cooling recommended `_ `*`) #. `High endurance microSD `_ (recommended 128GB or more) -#. `GPIO mini speaker/buzzer `_ (These often sell out, please let us know if this link needs to be refreshed) +#. `GPIO mini speaker/buzzer `_ (These often sell out, please let us know if this link needs to be refreshed) #. Ethernet cable #. MicroSD → USB adapter (or you may have a microSD port on your computer) @@ -105,7 +105,7 @@ Hardware: Components #. `Power supply for Raspberry Pi 4B `_ Make sure this is at minimum 15w and 3.5a. #. Case for Raspberry Pi 4B (`passive cooling recommended `_ `*`) #. A `16GB microSD card `_ (no need for bigger). If you have ABSOLUTELY NO data to migrate, you may choose to re-use the card already in your Embassy. -#. `GPIO mini speaker/buzzer `_ (These often sell out, please let us know if this link needs to be refreshed) +#. `GPIO mini speaker/buzzer `_ (These often sell out, please let us know if this link needs to be refreshed) #. Ethernet cable #. MicroSD → USB adapter (or you may have a microSD port on your computer) #. An external drive (1TB minimum, 2TB SSD recommended), or an `internal drive `_ with an `USB enclosure `_, as sold with our upgrade kits. MUST CONNECT OVER USB 3.0 From 4375ed76a1e51c4ad09382f5121dad7f5cbe7227 Mon Sep 17 00:00:00 2001 From: kn0wmad Date: Mon, 29 Nov 2021 12:14:25 -0700 Subject: [PATCH 12/13] update 030 messaging --- source/support/FAQ/030-faq.rst | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/support/FAQ/030-faq.rst b/source/support/FAQ/030-faq.rst index 44c2b62..73b0acd 100644 --- a/source/support/FAQ/030-faq.rst +++ b/source/support/FAQ/030-faq.rst @@ -34,21 +34,17 @@ If you are unsure what drive type is best for you, get an external SSD with a US 3 - For the SD card, any type will work, and 16GB is recommended. A larger card will not offer any benefit. These are $5-10USD. EmbassyOS will be stored on this card. -4 - For the powered USB hub, any kind will work as long as it has it's own power supply and is USB 3.0 capable. - What size drive do I need? -------------------------- This will depend on how you want to use your Embassy. We recommend a minimum of 1TB if you intend to run a pruned Bitcoin node, or no Bitcoin node at all, and a 2TB minimum if you intend to run a full archival node, which will add a lot more functionality. If you intend to run your own "cloud", then consider the amount of data you are storing. If you have lots of video files, for example, you may start filling up the disk fairly quickly. Any service you are currently using should have a simple way for you to view your data usage. Make sure to leave plenty of room for expansion. -Finally, remember that you can always expand to a larger drive in the future. EOS will also be adding the ability to store on multiple drives, and other advanced storage features, in the near future. +Finally, remember that you can always expand to a larger drive in the future. EOS will also be adding additional advanced storage features in the near future. I want to add an HDD later, in addition to my SSD, what are the performance consequences of doing this? ------------------------------------------------------------------------------------------------------- -After additional drive support is added (v0.3.x, no current ETA), we will recommend using uniform drives, but it will not be required. If you choose to add a lower performance HDD to an existing SSD in order to increase storage capacity, the reads and writes to the HDD will obviously be slower, but otherwise there will not be any issues. - -The reason we will recommend uniform drives is because we will be adding the ability to create redundancy (drive mirroring, as an advanced feature), if you are interested. This will only be necessary if uptime is very important to you, such as when running a Lightning routing node, or serving a popular .onion site. Most users will find that a single drive, adding drives as space is needed, will suit their needs just fine. +At this time, we recommend against this as the Raspberry Pi cannot deliver enough power. We will be revisiting in future, but a powered usb hub would be a minimum requirement for this setup. Can I use an internal SSD with a USB 3 enclosure? I've heard these may have issues? ------------------------------------------------------------------------------------ @@ -56,7 +52,7 @@ Yes, you may, and our original upgrade kits come with this style of drive. We h Does my external drive need its own power supply? ------------------------------------------------- -We are recommending the use of a powered USB hub to connect drives with (and power the Pi if it has USB-C). However, you may use powered disk drives if you prefer. +You may use powered disk drives if you prefer, but if only connecting one SSD, it is not necessary. Can I re-use the SD Card from my Embassy for the new version? ------------------------------------------------------------- From 223866d793a62b376edb13007bb720842e5ae416 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Fri, 3 Dec 2021 10:18:13 -0700 Subject: [PATCH 13/13] update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0afcafa..ad4ad61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store .vscode/ build/ -build-send.sh \ No newline at end of file +build-send.sh +utils/deploy.sh \ No newline at end of file