From 0bb7ed6de487da21292b64bac91c61a120f0fbfd Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Tue, 21 Sep 2021 18:47:09 -0400
Subject: [PATCH] Add details to bitcoin post

---
 i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst | 77 ++++++++++++++++++-
 i2p2www/pages/downloads/easyinstall.html      | 14 ++--
 i2p2www/pages/global/nav.html                 |  1 -
 3 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst b/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst
index 9f19a8f1c..8a404d889 100644
--- a/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst
+++ b/i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst
@@ -1,5 +1,5 @@
 =============================================================
-{% trans -%}Bitcoin Code adds support for I2P!{%- endtrans %}
+{% trans -%}Bitcoin Core adds support for I2P!{%- endtrans %}
 =============================================================
 
 .. meta::
@@ -27,6 +27,79 @@ I2P support is automatic, via the SAM API. This is also exciting news, because
 it highlights some of the things I2P is singularly good at, like empowering 
 application developers to build I2P connections programmatically and
 conveniently. Bitcoin-over-I2P users can use I2P with no manual configuration by
-enabling the SAM API.
+enabling the SAM API and running Bitcoin with I2P enabled.
 {%- endtrans %}
 
+{% trans -%}
+Configuring your I2P Router
+{%- endtrans %}
+---------------------------
+
+{% trans -%}
+In order to set up an I2P Router to provide anonymous connectivity to bitcoin,
+the SAM API needs to be enabled. In Java I2P, you should go to `http://127.0.0.1:7657/configclients
+<http://127.0.0.1:7657/configclients>`_. and start the SAM Application Bridge
+with the "Start" button. You may also want to enable the SAM Application Bridge
+by default by checking the "Run at Startup" box and clicking "Save Client
+Configuration."
+{%- endtrans %}
+
+{% trans -%}
+On i2pd, the SAM API is normally enabled by default, but if it isn't, you should
+set::
+
+  sam.enabled=true
+
+in your i2pd.conf file.
+{%- endtrans %}
+
+{% trans -%}
+Configuring your Bitcoin Node for Anonymity and Connectivity
+{%- endtrans %}
+------------------------------------------------------------
+
+{% trans -%}
+Getting Bitcoin itself launched in an anonyous mode still requires editing some
+configuration files in the Bitcoin Data Directory, which is %APPDATA%\Bitcoin on
+Windows, ~/.bitcoin on Linux, and ~/Library/Application Support/Bitcoin/ on Mac
+OSX. It also requires at least version 22.0.0 for I2P support to be present. 
+After following the following instructions, you should have a private Bitcoin
+node which uses I2P for I2P connections, and Tor for .onion and clearnet
+connections, so that all your connections are anonymized. For convenience,
+Windows users should open their Bitcoin Data Directory by opening the start menu
+and searching for "Run." Inside the run prompt, type "%APPDATA%\Bitcoin" and
+press enter.
+{%- endtrans %}
+
+{% trans -%}
+In that directory create a file called "i2p.conf." On Windows, you should make
+sure that you've add quotes around the file when you save it, in order to
+prevent Windows from adding a default file extension to the file. The file
+should contain the following I2P-Related Bitcoin configuration options::
+
+  i2psam=127.0.0.1:7656
+  i2pacceptincoming=true
+  onlynet=i2p
+
+Next, you should create another file called "tor.conf." The file should contain
+the following Tor related configuration options::
+
+  proxy=127.0.0.1:9050
+  onion=127.0.0.1:9050
+  onlynet=tor
+
+Finally, you'll need to "Include" these configuration options in your Bitcoin
+configuration file, called "bitcoin.conf" in the Data Directory. Add these two
+lines to your bitcoin.conf file::
+
+  includeconf=i2p.conf
+  includeconf=tor.conf
+
+Now your Bitcoin node is configured to only use anonymous connections. In order
+to enable direct connections to remote nodes, remove the lines beginning in::
+
+  onlynet=
+
+You can do this if you do not require your Bitcoin node to be anonymous, and
+it helps anonymous users connect to the rest of the Bitcoin network.
+{%- endtrans %}
\ No newline at end of file
diff --git a/i2p2www/pages/downloads/easyinstall.html b/i2p2www/pages/downloads/easyinstall.html
index 89ceb0a16..e18c8669b 100644
--- a/i2p2www/pages/downloads/easyinstall.html
+++ b/i2p2www/pages/downloads/easyinstall.html
@@ -14,12 +14,14 @@ this installer, visit <a href="{{ firefox }}">The Firefox Profile Page</a>.
 {%- endtrans %}</p>
 <h2>{{ _('Is it a Zero-Dependency I2P Browser?') }}</h2>
 <p><strong>{% trans -%}
-Not yet. {%- endtrans %}</strong>{% trans issueurl="https://i2pgit.org/i2p-hackers/i2p.firefox/-/issues/2" -%} For now, this installer still requires
-Firefox to be installed on the system, it does not bundle a Firefox installer of
-its own. This was a judgement made to protect users of the bundle, we believe
-that you should obtain your Firefox distribution from a vendor who can provide
-updates. Please obtain Firefox from Mozilla. If you would like to discuss
-supporting other browsers, please join the discussion on the
+Not yet.{%- endtrans %}</strong>
+{% trans issueurl="https://i2pgit.org/i2p-hackers/i2p.firefox/-/issues/2" -%}
+For now, this installer still requires Firefox to be installed on the system, it
+does not bundle a Firefox installer of its own. This was a judgement made to
+protect users of the bundle, we believe that you should obtain your Firefox
+distribution from a vendor who can provide updates. Please obtain Firefox from
+Mozilla. If you would like to discuss supporting other browsers, please join the
+discussion on the
 <a href="{{ issueurl }}">Gitlab Issue</a>.
 {%- endtrans %}</p>
 <h2>{{ _('Why should I use it?') }}</h2>
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index bb3f789ca..2bea3e70a 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -51,7 +51,6 @@
               <li><a href="{{ site_url('get-involved/guides/ides') }}"><div class="menuitem"><span>{{ _('Using an IDE with I2P') }}</span></div></a></li>
               <li><a href="{{ site_url('get-involved/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
               <li><a href="{{ site_url('docs/applications/git') }}"><div class="menuitem"><span>{{ _('Git') }}</span></div></a></li>
-              <li><a href="{{ site_url('get-involved/guides/monotone') }}"><div class="menuitem"><span>{{ _('Monotone') }}</span></div></a></li>
             </ul>
           </li>
           <li><a href="{{ site_url('get-involved/guides/new-translators') }}"><div class="menuitem"><span>{{ _('Translate I2P into more Languages') }}</span></div></a></li>
-- 
GitLab