Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.www into debchanges

i2p2www/blog/2021/09/18/i2p-bitcoin.draft.rst

@@ -0,0 +1,108 @@
+=============================================================
+{% trans -%}Bitcoin Core adds support for I2P!{%- endtrans %}
+=============================================================
+
+.. meta::
+   :author: idk
+   :date: 2021-09-18
+   :category: general
+   :excerpt: {% trans %}A new use case and a signal of growing acceptance{% endtrans %}
+
+{% trans -%}
+An event months in the making, Bitcoin Core has added official support for I2P!
+Bitcoin-over-I2P nodes can interact fully with the rest of the Bitcoin nodes,
+using the help of nodes that operate within both I2P and the clearnet, making
+them first-class participants in the Bitcoin network. It's exciting to see
+large communities like Bitcoin taking notice of the advantages I2P can bring
+to them providing privacy and reachability to people all over the world.
+{%- endtrans %}
+
+{% trans -%}
+How it Works
+{%- endtrans %}
+------------
+
+{% trans -%}
+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 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 anonymous 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. 
+{%- endtrans %}
+
+{% trans -%}
+After following these 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 anonymous. 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 %}

i2p2www/downloads.py

@@ -90,13 +90,13 @@ def downloads_windows():
     return render_template('downloads/windows.html')
 
 # AIO-Windows-specific page
-def downloads_nsis():
+def downloads_easyinstall():
     # TODO: read mirror list or list of available files
     if request.headers.get('X-I2P-Desthash') and not request.headers.get('X-Forwarded-Server'):
         def_mirror = DEFAULT_I2P_MIRROR
     else:
         def_mirror = DEFAULT_MIRROR
-    return render_template('downloads/nsis.html', def_mirror=def_mirror)
+    return render_template('downloads/easyinstall.html', def_mirror=def_mirror)
 
 # Docker-specific page
 def downloads_docker():

i2p2www/legacy.py

@@ -20,7 +20,8 @@ LEGACY_FUNCTIONS_MAP={
     'firefox':        {'function': 'downloads_firefox', 'params': {}},
     'lab':           {'function': 'downloads_lab',    'params': {}},
     'mac':           {'function': 'downloads_mac',    'params': {}},
-    'nsis':           {'function': 'downloads_nsis',    'params': {}},
+    'easyinstall':           {'function': 'downloads_easyinstall',    'params': {}},
+    'nsis':           {'function': 'downloads_easyinstall',    'params': {}},
     'windows':           {'function': 'downloads_windows',    'params': {}},
     'download':      {'function': 'downloads_list',   'params': {}},
     'installation':  {'function': 'downloads_list',   'params': {}},

i2p2www/pages/downloads/easyinstall.html

@@ -1,12 +1,12 @@
 {% extends "global/layout.html" %}
 {%- from "downloads/macros" import package_outer with context -%}
-{% block title %}I2P Easy Install Bundle(Beta){% endblock %}
+{% block title %}I2P Easy Install Bundle (Beta) for Windows{% endblock %}
 {% block content %}
 
-<h1>{{ _('I2P Easy Install Bundle(Beta)') }}</h1>
+<h1>{{ _('I2P Easy Install Bundle (Beta) for Windows') }}</h1>
 <p>{% trans firefox="/firefox" -%}
 This is an "All-in-One" installer which includes the complete I2P desktop
-software and all of it's dependencies in a single, easy-to-install package. It
+software and all of its dependencies in a single, easy-to-install package. It
 is built on the premise that I2P should be easy, and that we should help our
 users get their initial configuration in place instead of requiring an elaborate
 install process. To learn more about the Firefox profile that comes bundled with
@@ -14,13 +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.
+Not yet.{%- endtrans %}</strong>
-{%- endtrans %}</strong>{% trans issueurl="https://i2pgit.org/i2p-hackers/i2p.firefox/-/issues/2" -%} For now, this installer still requires
+{% trans issueurl="https://i2pgit.org/i2p-hackers/i2p.firefox/-/issues/2" -%}
-Firefox to be installed on the system, it does not bundle a Firefox installer of
+For now, this installer still requires Firefox to be installed on the system, it
-it's own. This was a judgement made to protect users of the bundle, we believe
+does not bundle a Firefox installer of its own. This was a judgement made to
-that you should obtain your Firefox distribution from a vendor who can provide
+protect users of the bundle, we believe that you should obtain your Firefox
-updates. Please obtain Firefox from Mozilla. If you would like to discuss
+distribution from a vendor who can provide updates. Please obtain Firefox from
-supporting other browsers, please join the discussion on the
+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>
@@ -108,7 +109,7 @@ I2P routers are designed to have long uptimes, and so unlike Tor Browser, the
 lifetime of your I2P Router is not tied to the lifetime of your I2P browsing
 session. The browser profile will manage your history, your browser's local
 storage and cache, and your browsing context but it will never stop your I2P
-router on it's own. You may stop the router using the web interface on the
+router on its own. You may stop the router using the web interface on the
 router console homepage.
 {%- endtrans %}</p>
 

i2p2www/pages/downloads/firefox.html

@@ -3,7 +3,7 @@
 {% block title %}Firefox Profile{% endblock %}
 {% block content %}
 
-<h1>{{ _('I2P Easy Install Bundle(Beta)') }}</h1>
+<h1>{{ _('I2P Easy Install Bundle (Beta) for Windows') }}</h1>
 <p>{% trans nsis="/nsis" -%}
 The I2P Firefox Browser Profile has been expanded into the new I2P Easy Install
 Bundle, which is in Beta. If you already have an I2P Router installed, it is
@@ -12,7 +12,7 @@ I2P Settings will be left untouched. If you do not have an I2P router installed,
 then you do not need to install I2P. This package will install I2P at the same
 time it installs the browser profile. This page has been kept to document the
 motivations and design of the included Firefox profile. To learn more about the
-new bundle, visit <a href="{{ nsis }}">The Easy-Install Bundle Page</a>.
+new bundle, visit <a href="{{ nsis }}">The Easy Install Bundle Page</a>.
 {%- endtrans %}</p>
 <h2>{{ _('I2P Firefox Browser Profile') }}</h2>
 <p>{% trans -%}
@@ -107,7 +107,7 @@ I2P routers are designed to have long uptimes, and so unlike Tor Browser, the
 lifetime of your I2P Router is not tied to the lifetime of your I2P browsing
 session. The browser profile will manage your history, your browser's local
 storage and cache, and your browsing context but it will never stop your I2P
-router on it's own. You may stop the router using the web interface on the
+router on its own. You may stop the router using the web interface on the
 router console homepage.
 {%- endtrans %}</p>
 

i2p2www/pages/downloads/list.html

@@ -101,14 +101,14 @@ I2P connections.</p>
     <p>{% trans -%}
     After installing Java, download the file and double-click to run it.
     {%- endtrans %}</p>
-    <h3>{% trans %}Easy-Install Bundle(Beta){% endtrans %}</h3>
+    <h3>{% trans %}Easy-Install Bundle (Beta){% endtrans %}</h3>
     <div class="file">
       <p>{% trans %}It's now possible to install all I2P components using
       a single package(<strong>No Java Required</strong>). To try out the new installer, click here.
       This bundle can also be used to configure a Firefox Profile. It will not
       interfere with an existing I2P installation if one exists.
       {% endtrans %}</p>
-      <a class="default" href="/nsis">{% trans %}I2P Easy-Install Bundle(Beta){% endtrans %}</a>
+      <a class="default" href="/nsis">{% trans %}I2P Easy Install Bundle (Beta){% endtrans %}</a>
     </div>
     <h3>{% trans %}Detailed Install Guide{% endtrans %}</h3>
     <div class="file">
@@ -137,7 +137,7 @@ I2P connections.</p>
     the install procedure in your terminal.
     {%- endtrans %}
 
-    <h3>{% trans %}DMG Bundle (BETA){% endtrans %}</h3>
+    <h3>{% trans %}DMG Bundle (Beta){% endtrans %}</h3>
     If you do not want to use the installer or do not have a Java Runtime Environment available
     on your Mac, you can try our latest DMG bundle.
     <div class="file">

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>

i2p2www/pages/site/about/glossary.html

@@ -2,16 +2,80 @@
 {% block title %}{{ _('Glossary') }}{% endblock %}
 {% block content %}
 {% trans -%}
-This page lists often-used terminology when discussing I2P and cryptography.
+This table lists often-used terminology when discussing I2P and cryptography.
 {%- endtrans %}
 <table>
     <ul>
-        <li>I2P: Invisible Internet Project: a project meant to provide an anonymity layer, so user can communicate anonymously using a range of applications.</li>
+        <li>{% trans -%}I2P: Invisible Internet Project: a project meant to
-        <li>Router: The core I2P software, which routes encrypted packets on the I2P network. All routers by default participate in the network, which both helps the network and provides cover traffic for any clients or servers connecting to the I2P network through the router.</li>
+        provide an anonymity layer, so user can communicate anonymously using a
-        <li>RouterIdentity: A collection of information required to communicate directly with a router, such as its IP address and listening port, public signing and encryption keys etc.</li>
+        range of applications.{%- endtrans %}</li>
-        <li>Tunnel: An anonymous communication pathway between a client or server and the I2P network. Tunnels are unidirectional, so any one client or server must have at least two Tunnels - one for inbound traffic and one for outbound traffic.</li>
+        <li>{% trans -%}Router: The core I2P software, which routes encrypted
-        <li>Destination: The cryptographic identity of a tunnel. These are the identities of clients and servers within the I2P network, and are analogous to the IP:port of a computer on the normal internet.</li>
+        packets on the I2P network. All routers by default participate in the
-        <li>LeaseSet: A collection of information required to communicate with a client or server at a particular Destination, such as the gateways of the inbound Tunnels for that Destination.</li>
+        network, which both helps the network and provides cover traffic for any
+        clients or servers connecting to the I2P network through the
+        router.{%- endtrans %}</li>
+        <li>{% trans -%}RouterIdentity: A collection of information required to
+        communicate directly with a router, such as its IP address and listening
+        port, public signing and encryption keys etc.{%- endtrans %}</li>
+        <li>{% trans -%}Tunnel: An anonymous communication pathway between a
+        client or server and the I2P network. Tunnels are unidirectional, so any
+        one client or server must have at least two Tunnels - one for inbound
+        traffic and one for outbound traffic.{%- endtrans %}</li>
+        <li>{% trans -%}Destination: The cryptographic identity of a tunnel.
+        These are the identities of clients and servers within the I2P network,
+        and are analogous to the IP:port of a computer on the normal
+        internet.{%- endtrans %}</li>
+        <li>{% trans -%}LeaseSet: A collection of information required to
+        communicate with a client or server at a particular Destination, such as
+        the gateways of the inbound Tunnels for that
+        Destination.{%- endtrans %}</li>
+    </ul>
+</table>
+{% trans -%}This table lists definition of different networks and their components. These
+terms and the definitions provided are taken from
+<a href="https://decentpatterns.xyz/report/#key-terms">Decentralization Off The
+Shelf: 7 Maxims by Simply Secure</a>(used with permission).{%- endtrans %}
+<table>
+    <ul>
+        <li>{% trans -%}Decentralization: Network architecture that avoids
+        reliance on a single party. Encompasses peer-to-peer, blockchain,
+        federated, and distributed technologies that involve many individual
+        users.{%- endtrans %}</li>
+        <li>{% trans -%}Peer-to-Peer (p2p): Peers make a portion of their 
+        resources, such as processing power, disk storage or network bandwidth,
+        directly available to other network participants, without the need for
+        central coordination by servers or stable hosts. Popularized by
+        BitTorrent, Napster, and Bitcoin.{%- endtrans %}</li>
+        <li>{% trans -%}Federated: Federation allows separate deployments of a
+        service to communicate with each other through a common protocol, for
+        instance a mail server run by Google federates with a mail server run by
+        Microsoft when you send an email from @gmail.com to @hotmail.com.
+        Each deployment may host multiple users.{%- endtrans %}</li>
+        <li>{% trans -%}Blockchain: A distributed ledger that can record
+        transactions between multiple parties efficiently and in a verifiable
+        and permanent way.{%- endtrans %}</li>
+        <li>{% trans -%}Distributed systems: Academic topic within the
+        discipline of Computer Science which is concerned with the design of
+        computer systems that consist of many individual computers connected
+        over a network. Peer-to-peer networks and blockchains are examples of
+        distributed systems architectures.{%- endtrans %}</li>
+        <li>{% trans -%}TCP/UDP: The two foundational transport protocols used
+        on the Internet. Common protocols used to send data between two
+        computers.{%- endtrans %}</li>
+        <li>{% trans -%}DHT: Distributed hash table, used in some projects to
+        connect peers to each other by storing information in the form of
+        key-value pairs in a distributed manner.{%- endtrans %}</li>
+        <li>{% trans -%}IP address: A number of a computer or network which is
+        unique and thus can be used to address it.{%- endtrans %}</li>
+        <li>{% trans -%}WebRTC: A protocol standard for establishing connections
+        in a web browser where data passes directly between
+        users.{%- endtrans %}</li>
+        <li>{% trans -%}Hash: A number, usually displayed as a string of letters
+        and numbers. It can serve as a ‘fingerprint’ uniquely identifying
+        data.{%- endtrans %}</li>
+        <li>{% trans -%}UX: User experience, the overall experience of a person
+        using a product or a service, especially in terms of how easy it is to
+        use.{%- endtrans %}</li>
     </ul>
 </table>
 {% endblock %}

i2p2www/sitemap.py

@@ -119,7 +119,7 @@ def render_sitemap():
         'path': '/download/mac',
         })
     urls.append({
-        'path': '/download/nsis',
+        'path': '/download/easyinstall',
         })
     urls.append({
         'path': '/download/windows',

i2p2www/urls.py

@@ -92,7 +92,8 @@ url('/<lang:lang>/download', 'downloads.downloads_list')
 url('/<lang:lang>/download/debian', 'downloads.downloads_debian')
 url('/<lang:lang>/download/docker', 'downloads.downloads_docker')
 url('/<lang:lang>/download/windows', 'downloads.downloads_windows')
-url('/<lang:lang>/download/nsis', 'downloads.downloads_nsis')
+url('/<lang:lang>/download/easyinstall', 'downloads.downloads_easyinstall')
+url('/<lang:lang>/download/nsis', 'downloads.downloads_easyinstall')
 url('/<lang:lang>/download/firefox', 'downloads.downloads_firefox')
 url('/<lang:lang>/download/config', 'downloads.downloads_config')
 url('/<lang:lang>/download/lab', 'downloads.downloads_lab')