Add split download pages for debian, ubuntu, docker

Adds content to /mac page

See merge request i2p-hackers/i2p.www!16

i2p2www/downloads.py

@@ -85,9 +85,63 @@ def downloads_list():
 def downloads_debian():
     return render_template('downloads/debian.html')
 
-# Windows-specific page
+# Windows-specific instructions page
 def downloads_windows():
     return render_template('downloads/windows.html')
+    
+# Windows-specific download page
+def downloads_windows_only():
+    # 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/download_windows.html', def_mirror=def_mirror)
+
+# OSX-specific download page
+def downloads_osx_only():
+    # 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/download_osx.html', def_mirror=def_mirror)
+
+# Linux-specific download page
+def downloads_linux_only():
+    # 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/download_linux.html', def_mirror=def_mirror)
+
+# Ubuntu-specific download page
+def downloads_debian_only():
+    # 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/download_debian.html', def_mirror=def_mirror)
+
+# Debian-specific download page
+def downloads_ubuntu_only():
+    # 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/download_ubuntu.html', def_mirror=def_mirror)
+
+# Android-specific download page
+def downloads_android_only():
+    # 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/download_android.html', def_mirror=def_mirror)
 
 # AIO-Windows-specific page
 def downloads_easyinstall():

i2p2www/legacy.py

@@ -23,6 +23,13 @@ LEGACY_FUNCTIONS_MAP={
     'easyinstall':           {'function': 'downloads_easyinstall',    'params': {}},
     'nsis':           {'function': 'downloads_easyinstall',    'params': {}},
     'windows':           {'function': 'downloads_windows',    'params': {}},
+    'download_docker':           {'function': 'downloads_docker',    'params': {}},
+    'download_windows':           {'function': 'downloads_windows_only',    'params': {}},
+    'download_osx':           {'function': 'downloads_osx_only',    'params': {}},
+    'download_linux':           {'function': 'downloads_linux_only',    'params': {}},
+    'download_debian':           {'function': 'downloads_debian_only',    'params': {}},
+    'download_ubuntu':           {'function': 'downloads_ubuntu_only',    'params': {}},
+    'download_android':           {'function': 'downloads_android_only',    'params': {}},
     'download':      {'function': 'downloads_list',   'params': {}},
     'installation':  {'function': 'downloads_list',   'params': {}},
     'meetings':      {'function': 'meetings_index',   'params': {}},

i2p2www/pages/downloads/debian.html

@@ -92,100 +92,79 @@ part of <a href="#Post-install_work">starting I2P</a> and configuring it for you
 Note: The steps below should be performed with root access (i.e., switching
 user to root with <code>su</code> or by prefixing each command with <code>sudo</code>).
 {%- endtrans %}</p>
-<ol>
-  <li>{% trans -%}Ensure that <code>apt-transport-https</code> and <code>curl</code> are installed.{%- endtrans %}
+<ol>,
+  <li>{% trans -%}Ensure that <code>apt-transport-https</code>, <code>curl</code>, <code>lsb-release</code> are installed.{%- endtrans %}
     <pre>
     <code>
     sudo apt-get update
-    sudo apt-get install apt-transport-https curl</code>
+    sudo apt-get install apt-transport-https lsb-release curl</code>
     </pre>
   </li>
   <li>{% trans file='/etc/apt/sources.list.d/i2p.list',file2='/etc/debian_version' %}
     Check which version of Debian you are using on this page at the <a href="https://wiki.debian.org/LTS/" target="_blank">Debian wiki</a>
     and verify with <code>{{ file2 }}</code> on your system.
-    Then, add lines like the following to <code>{{ file }}</code>.{% endtrans %}<br>
-<br />
-For Buster (stable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ buster main
-    deb-src https://deb.i2p2.de/ buster main</code>
-</pre>
-
-<br />
-For Stretch (oldstable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ stretch main
-    deb-src https://deb.i2p2.de/ stretch main</code>
-</pre>
-
-<br />
-For Jessie (oldoldstable):<br />
-<pre>
-    <code>deb https://deb.i2p2.de/ jessie main
-    deb-src https://deb.i2p2.de/ jessie main</code>
-</pre>
-
-<br />
-For Wheezy (obsolete):<br>
-<pre>
-    <code>deb https://deb.i2p2.de/ wheezy main
-    deb-src https://deb.i2p2.de/ wheezy main</code>
-</pre>
-<br />
-
-{% trans -%}Note: If you are running Debian Sid (testing), then you can install I2P directly from Debian's main repository{%- endtrans %}:
-  <pre>
-  <code>sudo apt-get install i2p</code>
-  </pre>
+    Then, for all Current Debian distributions run the following command to create <code>{{ file }}</code>.{% endtrans %}<br>
+    <pre>
+    <code>
+  echo "deb [signed-by=/usr/share/keyrings/i2p-archive-keyring.gpg] https://deb.i2p2.de/ $(lsb_release -sc) main" \
+  | sudo tee /etc/apt/sources.list.d/i2p.list
+    </code>
+    </pre>
 
   </li>
 
-  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.asc') -%}
-Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
-<pre>
-<code>
-  curl -o i2p-debian-repo.key.asc https://geti2p.net/_static/i2p-debian-repo.key.asc</code>
-</pre>
+  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.gpg') -%}
+  Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
+    <pre>
+    <code>
+  curl -o i2p-archive-keyring.gpg https://geti2p.net/_static/i2p-archive-keyring.gpg</code>
+    </pre>
   </li>
 
   <br />
 
-  <li>
-    {% trans -%}Check the fingerprint and owner of the key without importing anything{%- endtrans %}:<br />
+  <li>{% trans -%}Display the key fingerprint.{%- endtrans %}
     <pre>
     <code>
-  gpg -n --import --import-options import-show i2p-debian-repo.key.asc</code>
+  gpg --keyid-format long --import --import-options show-only --with-fingerprint i2p-archive-keyring.gpg
+    </code>
+    </pre>
+    {% trans -%}Verify that this key fingerprint matches the output:{%- endtrans %}
+    <pre>
+    <code>
+  7840 E761 0F28 B904 7535  49D7 67EC E560 5BCF 1346</code>
     </pre>
   </li>
 
-  <li>
-    {% trans -%} Add the key to APT's keyring{%- endtrans %}:<br />
+  <br />
+
+  <li>{% trans -%}Copy the keyring to the keyrings directory:{%- endtrans %}
     <pre>
     <code>
-  sudo apt-key add i2p-debian-repo.key.asc</code>
+  sudo cp ~/i2p-archive-keyring.gpg /usr/share/keyrings</code>
     </pre>
   </li>
-
+  
   <li>
-    {% trans %}Notify your package manager of the new repository by entering{% endtrans %}<br />
+    {% trans %}Notify your package manager of the new repository by entering:{% endtrans %}<br />
     <pre>
     <code>
   sudo apt-get update</code>
-    </pre>
-{% trans -%}
-This command will retrieve the latest list of software from every
-repository enabled on your system, including the I2P repository added in step
-1.
-{%- endtrans %}
-  </li><br />
-  <li>{% trans -%}
-You are now ready to install I2P! Installing the <code>i2p-keyring</code>
-package will ensure that you receive updates to the repository's GPG key.
-{%- endtrans %}<br />
-<pre>
+    </pre>{% trans -%}This command will retrieve the latest list of software
+    from every repository enabled on your system, including the I2P repository
+    added in step 1.{%- endtrans %}
+  </li>
+  
+  <br />
+
+  <li>{% trans -%}You are now ready to install I2P! Installing the <code>i2p-keyring</code>
+  package will ensure that you receive updates to the repository's GPG key.
+  {%- endtrans %}<br />
+    <pre>
     <code>
   sudo apt-get install i2p i2p-keyring</code>
-  </pre></li>
+    </pre>
+  </li>
 </ol>
 <p>
 {% trans -%}

i2p2www/pages/downloads/download_android.html

@@ -0,0 +1,93 @@
+{% extends "global/layout.html" %}
+{%- from "downloads/macros" import package, package_outer with context -%}
+
+{% set release_signer = 'zzz' %}
+
+{% block title %}{{ _('Download') }}{% endblock %}
+{% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
+<ul>
+<li><a href="/download_windows">Windows</a>
+<li><a href="/download_osx">Mac OS X</a>
+<li><a href="/download_linux">GNU/Linux / BSD / Solaris</a>
+<li><a href="/download_debian">Ubuntu</a>
+<li><a href="/download_debian">Debian</a>
+<li><a href="/download_android">Android</a>
+<li><a href="/download_docker">Docker</a>
+<li><a href="/download_source">{{ _('Source package') }}</a>
+<li><a href="/download_update">{{ _('Manual updates') }}</a>
+</ul>
+{% endblock %}
+
+{% block content %}
+<!--<h3>{{ _('Lab') }}</h3>
+{% trans lab='/lab' %}
+If you would like to try the latest experimental I2P projects, visit the <a href = "{{ lab }}">I2P Lab</a>
+{% endtrans -%}-->
+<h3>{{ _('Getting Started') }}</h3>
+<h4>{% trans %}Basic Steps{% endtrans %}</h4>
+<p>{% trans %}For most platforms and systems, setting I2P installed and running will
+consist of up to three steps.{% endtrans %}</p>
+<ul>
+  <li><strong>{% trans %}Install Java: {% endtrans %}</strong>{% trans java='https://java.com/download/',
+openjdk='http://openjdk.java.net/install/',
+icedtea='http://icedtea.classpath.org/wiki/Main_Page',
+arm8='https://openjdk.java.net/install/',
+ibmsdk7='http://www.ibm.com/developerworks/java/jdk/linux/download.html',
+detectjre='https://java.com/en/download/installed.jsp?detect=jre&amp;try=1' %} I2P is written in Java and requires
+a Java system to be installed to run. In addition to the I2P download, you need to install Java if you do not have it 
+already installed. I2P requires Java Runtime Version 7 or higher.
+(<a href="{{ java }}">Oracle</a>,
+<a href="{{ openjdk }}">OpenJDK</a>, or
+<a href="{{ icedtea }}">IcedTea</a>
+Java Version 7 or 8 recommended,
+except Raspberry Pi: <a href="{{ arm8 }}">OpenJDK 9 for ARM</a>,
+PowerPC: <a href="{{ ibmsdk7 }}">IBM Java SE 7 or 8</a>)
+<br />
+<a href="{{ detectjre }}">Determine your installed Java version here</a>
+or type <tt>java -version</tt> at your command prompt.
+Only two platforms do not require Java to be installed before I2P is installed, those platforms are:{% endtrans %}</li>
+  <ul>
+    <li><strong>{% trans %}Android: {% endtrans %}</strong>{% trans %}Android comes with a Java virtual machine
+as part of the platform, which I2P for Android uses. Therefore it is not necessary to install Java to use
+I2P for Android.{% endtrans %}</li>
+  </ul>
+  <li><strong>{% trans %}Install I2P: {% endtrans %}</strong>{% trans %}Once you have Java installed, you should
+run the I2P installer for your platform. This step applies to all systems.{% endtrans %}</li>
+  <li><strong>{% trans %}Install/Configure a Browser(Optional): {% endtrans %}</strong>{% trans %}Finally, you'll need to
+configure applications to use I2P. Many applications can use I2P, but the first application most people configure is a Web
+Browser for browsing I2P sites. Detailed instructions are available on the{% endtrans %}
+<a href="{{ site_url() }}about/browser-config">{% trans %}Browser Page{% endtrans %}</a>.</li>
+</ul>
+
+
+
+<h3>{{ _('Release Notes') }}</h3>
+<ul><li>
+<a href="{{ site_url() }}blog/category/release">{{ _('Release Notes') }}</a>
+</li><li>
+<a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/history.txt">{{ _('Change Log') }}</a>
+</li><li>
+<a href="https://raw.githubusercontent.com/i2p/i2p.android.base/master/CHANGELOG">{{ _('Android Change Log') }}</a>
+</li></ul>
+
+<div class="downloadlist">
+
+    <h5>{%- trans %}I2P for Android{%- endtrans %}</h5>
+{% call package('android') %}
+    <div class="warning">
+      {% trans -%}
+      Requires Android 4.0 (Ice Cream Sandwich) or higher. If you earlier installed
+      I2P, unfortunately this release fixes some IPC issues which will force you to uninstall your current installation before installing this.
+      {%- endtrans %}
+      {% trans -%}
+      512 MB RAM minimum; 1 GB recommended.
+      {%- endtrans %}
+      {% trans -%}
+      The releases are not compatible with eachother, as they have different signatures. Uninstall them
+      completely before installing any other version. The apk's from download.i2p2.de are signed by idk.
+      {%- endtrans %}
+    </div>
+{% endcall %}
+
+{% endblock %}

i2p2www/pages/downloads/download_debian.html

@@ -0,0 +1,177 @@
+{% extends "global/layout.html" %}
+{% block title %}Debian/Ubuntu{% endblock %}
+{% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
+<ul>
+<li><a href="/download_windows">Windows</a>
+<li><a href="/download_osx">Mac OS X</a>
+<li><a href="/download_linux">GNU/Linux / BSD / Solaris</a>
+<li><a href="/download_debian">Ubuntu</a>
+<li><a href="/download_debian">Debian</a>
+<li><a href="/download_android">Android</a>
+<li><a href="/download_docker">Docker</a>
+<li><a href="/download_source">{{ _('Source package') }}</a>
+<li><a href="/download_update">{{ _('Manual updates') }}</a>
+</ul>
+{% endblock %}
+{% block content %}
+<h1>{{ _('Debian I2P Packages') }}</h1>
+<h2 id="bionic">{{ _('Debian Buster, Ubuntu Bionic, and later') }}</h2>
+{% trans -%}
+I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid.
+However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions.
+If you are not running Debian Sid or the latest Ubuntu release,
+use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version.
+{%- endtrans %}
+
+<h2 id="others">{{ _('Debian or Ubuntu, All Versions') }}</h2>
+{% trans -%}The Debian packages should work on most platforms running:{%- endtrans %}
+<ul>
+  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Precise <em>12.04</em> and newer){% endtrans %}</li>
+  <li><a href="#ubuntu">Mint</a></li>
+  <li>{% trans %}<a href="#debian">Debian Linux</a> (Wheezy and newer){% endtrans %}</li>
+  <li><a href="#debian">Knoppix</a></li>
+</ul>
+
+{% trans trac='http://trac.i2p2.de/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p' -%}
+The I2P packages <em>may</em> work on systems not listed above. Please report any issues
+with these packages on <a href="{{ trac }}">Trac</a> at
+<a href="{{ trac }}">https://trac.i2p2.de</a>.
+{%- endtrans %}
+<h2 id="debian">{{ _('Instructions for Debian') }}</h2>
+
+<em>{% trans -%}Currently supported architectures{%- endtrans %}: amd64, i386, armhf, arm64, powerpc, ppc64el, s390x</em>
+
+<p>{% trans -%}
+Note: The steps below should be performed with root access (i.e., switching
+user to root with <code>su</code> or by prefixing each command with <code>sudo</code>).
+{%- endtrans %}</p>
+<ol>,
+  <li>{% trans -%}Ensure that <code>apt-transport-https</code>, <code>curl</code>, <code>lsb-release</code> are installed.{%- endtrans %}
+    <pre>
+    <code>
+    sudo apt-get update
+    sudo apt-get install apt-transport-https lsb-release curl</code>
+    </pre>
+  </li>
+  <li>{% trans file='/etc/apt/sources.list.d/i2p.list',file2='/etc/debian_version' %}
+    Check which version of Debian you are using on this page at the <a href="https://wiki.debian.org/LTS/" target="_blank">Debian wiki</a>
+    and verify with <code>{{ file2 }}</code> on your system.
+    Then, for all Current Debian distributions run the following command to create <code>{{ file }}</code>.{% endtrans %}<br>
+    <pre>
+    <code>
+  echo "deb [signed-by=/usr/share/keyrings/i2p-archive-keyring.gpg] https://deb.i2p2.de/ $(lsb_release -sc) main" \
+  | sudo tee /etc/apt/sources.list.d/i2p.list
+    </code>
+    </pre>
+
+  </li>
+
+  <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.gpg') -%}
+  Download <a href="{{ repokey }}">the  key used to sign the repository</a>:{%- endtrans %}
+    <pre>
+    <code>
+  curl -o i2p-archive-keyring.gpg https://geti2p.net/_static/i2p-archive-keyring.gpg</code>
+    </pre>
+  </li>
+
+  <br />
+
+  <li>{% trans -%}Display the key fingerprint.{%- endtrans %}
+    <pre>
+    <code>
+  gpg --keyid-format long --import --import-options show-only --with-fingerprint i2p-archive-keyring.gpg
+    </code>
+    </pre>
+    {% trans -%}Verify that this key fingerprint matches the output:{%- endtrans %}
+    <pre>
+    <code>
+  7840 E761 0F28 B904 7535  49D7 67EC E560 5BCF 1346</code>
+    </pre>
+  </li>
+
+  <br />
+
+  <li>{% trans -%}Copy the keyring to the keyrings directory:{%- endtrans %}
+    <pre>
+    <code>
+  sudo cp ~/i2p-archive-keyring.gpg /usr/share/keyrings</code>
+    </pre>
+  </li>
+  
+  <li>
+    {% trans %}Notify your package manager of the new repository by entering:{% endtrans %}<br />
+    <pre>
+    <code>
+  sudo apt-get update</code>
+    </pre>{% trans -%}This command will retrieve the latest list of software
+    from every repository enabled on your system, including the I2P repository
+    added in step 1.{%- endtrans %}
+  </li>
+  
+  <br />
+
+  <li>{% trans -%}You are now ready to install I2P! Installing the <code>i2p-keyring</code>
+  package will ensure that you receive updates to the repository's GPG key.
+  {%- endtrans %}<br />
+    <pre>
+    <code>
+  sudo apt-get install i2p i2p-keyring</code>
+    </pre>
+  </li>
+</ol>
+<p>
+{% trans -%}
+After the installation process completes you can move on to the next part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
+{%- endtrans %}
+</p>
+
+<h2 id="Post-install_work">{{ _('Post-install work') }}</h2>
+
+{% trans -%}
+Using these I2P packages the I2P router can be started in the following
+three ways:
+{%- endtrans %}
+<ul>
+  <li>
+    {% trans -%}
+    &quot;on demand&quot; using the i2prouter script. Simply run &quot;<code>i2prouter
+start</code>&quot; from a command prompt. (Note: Do <strong><u>not</u></strong> use
+sudo or run it as root!)
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    &quot;on demand&quot; without the <a href="http://wrapper.tanukisoftware.com/">java service wrapper</a>
+(needed on non-Linux/non-x86 systems) by running "<code>i2prouter-nowrapper</code>".
+(Note: Do <strong><u>not</u></strong>
+use sudo or run it as root!)
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    as a service that automatically runs when your system boots, even
+before logging in. The service can be enabled with "<code>dpkg-reconfigure
+i2p</code>" as root or using sudo. This is the recommended means of operation.
+    {%- endtrans %}
+  </li>
+</ul>
+
+<p>{% trans -%}
+When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
+if you can. The ports to forward can be found on the <a href="http://127.0.0.1:7657/confignet">
+network configuration page</a> in the router console. If guidance with respect to forwarding ports is needed,
+you may find <a href="http://portforward.com">portforward.com</a> to be helpful.
+{%- endtrans %}</p>
+
+<p>{% trans -%}
+Please review and <b>adjust the bandwidth settings</b> on the
+<a href="http://127.0.0.1:7657/config.jsp">configuration page</a>,
+as the default settings of 96 KB/s down / 40 KB/s up are fairly conservative.
+{%- endtrans %}</p>
+
+<p>{% trans browserconfig=site_url('about/browser-config') -%}
+If you want to reach I2P Sites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+{%- endtrans %}</p>
+
+{% endblock %}

i2p2www/pages/downloads/download_linux.html

@@ -0,0 +1,107 @@
+{% extends "global/layout.html" %}
+{%- from "downloads/macros" import package, package_outer with context -%}
+
+{% set release_signer = 'zzz' %}
+
+{% block title %}{{ _('Download') }}{% endblock %}
+{% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
+<ul>
+<li><a href="/download_windows">Windows</a>
+<li><a href="/download_osx">Mac OS X</a>
+<li><a href="/download_linux">GNU/Linux / BSD / Solaris</a>
+<li><a href="/download_debian">Ubuntu</a>
+<li><a href="/download_debian">Debian</a>
+<li><a href="/download_android">Android</a>
+<li><a href="/download_docker">Docker</a>
+<li><a href="/download_source">{{ _('Source package') }}</a>
+<li><a href="/download_update">{{ _('Manual updates') }}</a>
+</ul>
+{% endblock %}
+
+{% block content %}
+<!--<h3>{{ _('Lab') }}</h3>
+{% trans lab='/lab' %}
+If you would like to try the latest experimental I2P projects, visit the <a href = "{{ lab }}">I2P Lab</a>
+{% endtrans -%}-->
+<h3>{{ _('Getting Started') }}</h3>
+<h4>{% trans %}Basic Steps{% endtrans %}</h4>
+<p>{% trans %}For most platforms and systems, setting I2P installed and running will
+consist of up to three steps.{% endtrans %}</p>
+<ul>
+  <li><strong>{% trans %}Install Java: {% endtrans %}</strong>{% trans java='https://java.com/download/',
+openjdk='http://openjdk.java.net/install/',
+icedtea='http://icedtea.classpath.org/wiki/Main_Page',
+arm8='https://openjdk.java.net/install/',
+ibmsdk7='http://www.ibm.com/developerworks/java/jdk/linux/download.html',
+detectjre='https://java.com/en/download/installed.jsp?detect=jre&amp;try=1' %} I2P is written in Java and requires
+a Java system to be installed to run. In addition to the I2P download, you need to install Java if you do not have it 
+already installed. I2P requires Java Runtime Version 7 or higher.
+(<a href="{{ java }}">Oracle</a>,
+<a href="{{ openjdk }}">OpenJDK</a>, or
+<a href="{{ icedtea }}">IcedTea</a>
+Java Version 7 or 8 recommended,
+except Raspberry Pi: <a href="{{ arm8 }}">OpenJDK 9 for ARM</a>,
+PowerPC: <a href="{{ ibmsdk7 }}">IBM Java SE 7 or 8</a>)
+<br />
+<a href="{{ detectjre }}">Determine your installed Java version here</a>
+or type <tt>java -version</tt> at your command prompt.
+Only two platforms do not require Java to be installed before I2P is installed, those platforms are:{% endtrans %}</li>
+  <ul>
+    <li><strong>{% trans %}Debian and Ubuntu: {% endtrans %}</strong>{% trans %}On Debian and Ubuntu when using
+a .deb package to install, the system will automatically install and configure a Java environment for you.{% endtrans %}</li>
+  </ul>
+  <li><strong>{% trans %}Install I2P: {% endtrans %}</strong>{% trans %}Once you have Java installed, you should
+run the I2P installer for your platform. This step applies to all systems.{% endtrans %}</li>
+  <li><strong>{% trans %}Install/Configure a Browser(Optional): {% endtrans %}</strong>{% trans %}Finally, you'll need to
+configure applications to use I2P. Many applications can use I2P, but the first application most people configure is a Web
+Browser for browsing I2P sites. Detailed instructions are available on the{% endtrans %}
+<a href="{{ site_url() }}about/browser-config">{% trans %}Browser Page{% endtrans %}</a>.</li>
+</ul>
+
+
+
+<h3>{{ _('Release Notes') }}</h3>
+<ul><li>
+<a href="{{ site_url() }}blog/category/release">{{ _('Release Notes') }}</a>
+</li><li>
+<a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/history.txt">{{ _('Change Log') }}</a>
+</li></ul>
+
+<div class="downloadlist">
+
+    <h5>{%- trans %}I2P for Linux{%- endtrans %}</h5>
+{% call package('unix') %}
+    <p>{% trans i2pversion=ver() -%}
+    The most reliable way to launch the installer is from a terminal like this:
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer.
+    Depending on how your computer is set up, you may be able to start the
+    installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file or
+    right-clicking the file and selecting &quot;Open with Java&quot;.
+    Unfortunately, this behaviour is difficult to predict.
+    {%- endtrans %}</p>
+
+    <h3>{% trans %}Command line (headless) install:{% endtrans %}</h3>
+    {% trans i2pversion=ver() -%}
+    I2P can also be installed in a terminal environment, which may be especially
+    useful for servers, containers, or certain virtual machines. If you wish to
+    use the installer without a GUI, you can use the command 
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow
+    the install procedure in your terminal.
+    {%- endtrans %}
+{% endcall %}
+
+    <h5>{%- trans %}I2P for Debian and Ubuntu{%- endtrans %}</h5>
+{% call package_outer('deb', 'Debian / Ubuntu', 'images/download/debian-ubuntu.png') %}
+    <div class="file">
+      <a class="default" href="{{ get_url('downloads_debian') }}">{% trans %}Packages for Debian &amp; Ubuntu are available.{% endtrans %}</a>
+    </div>
+    <p>{% trans -%}
+    I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid.
+    However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions.
+    If you are not running Debian Sid or the latest Ubuntu release,
+    use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version.
+    {%- endtrans %}</p>
+{% endcall %}
+
+{% endblock %}

i2p2www/pages/downloads/download_osx.html

@@ -0,0 +1,97 @@
+{% extends "global/layout.html" %}
+{%- from "downloads/macros" import package, package_outer with context -%}
+
+{% set release_signer = 'zzz' %}
+
+{% block title %}{{ _('Download') }}{% endblock %}
+{% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
+<ul>
+<li><a href="/download_windows">Windows</a>
+<li><a href="/download_osx">Mac OS X</a>
+<li><a href="/download_linux">GNU/Linux / BSD / Solaris</a>
+<li><a href="/download_debian">Ubuntu</a>
+<li><a href="/download_debian">Debian</a>
+<li><a href="/download_android">Android</a>
+<li><a href="/download_docker">Docker</a>
+<li><a href="/download_source">{{ _('Source package') }}</a>
+<li><a href="/download_update">{{ _('Manual updates') }}</a>
+</ul>
+{% endblock %}
+
+{% block content %}
+<!--<h3>{{ _('Lab') }}</h3>
+{% trans lab='/lab' %}
+If you would like to try the latest experimental I2P projects, visit the <a href = "{{ lab }}">I2P Lab</a>
+{% endtrans -%}-->
+<h3>{{ _('Getting Started') }}</h3>
+<h4>{% trans %}Basic Steps{% endtrans %}</h4>
+<p>{% trans %}For most platforms and systems, setting I2P installed and running will
+consist of up to three steps.{% endtrans %}</p>
+<ul>
+  <li><strong>{% trans %}Install Java: {% endtrans %}</strong>{% trans java='https://java.com/download/',
+openjdk='http://openjdk.java.net/install/',
+icedtea='http://icedtea.classpath.org/wiki/Main_Page',
+arm8='https://openjdk.java.net/install/',
+ibmsdk7='http://www.ibm.com/developerworks/java/jdk/linux/download.html',
+detectjre='https://java.com/en/download/installed.jsp?detect=jre&amp;try=1' %} I2P is written in Java and requires
+a Java system to be installed to run. In addition to the I2P download, you need to install Java if you do not have it 
+already installed. I2P requires Java Runtime Version 7 or higher.
+(<a href="{{ java }}">Oracle</a>,
+<a href="{{ openjdk }}">OpenJDK</a>, or
+<a href="{{ icedtea }}">IcedTea</a>
+Java Version 7 or 8 recommended,
+except Raspberry Pi: <a href="{{ arm8 }}">OpenJDK 9 for ARM</a>,
+PowerPC: <a href="{{ ibmsdk7 }}">IBM Java SE 7 or 8</a>)
+<br />
+<a href="{{ detectjre }}">Determine your installed Java version here</a>
+or type <tt>java -version</tt> at your command prompt.
+Only two platforms do not require Java to be installed before I2P is installed, those platforms are:{% endtrans %}</li>
+  <li><strong>{% trans %}Install I2P: {% endtrans %}</strong>{% trans %}Once you have Java installed, you should
+run the I2P installer for your platform. This step applies to all systems.{% endtrans %}</li>
+  <li><strong>{% trans %}Install/Configure a Browser(Optional): {% endtrans %}</strong>{% trans %}Finally, you'll need to
+configure applications to use I2P. Many applications can use I2P, but the first application most people configure is a Web
+Browser for browsing I2P sites. Detailed instructions are available on the{% endtrans %}
+<a href="{{ site_url() }}about/browser-config">{% trans %}Browser Page{% endtrans %}</a>.</li>
+</ul>
+
+
+
+<h3>{{ _('Release Notes') }}</h3>
+<ul><li>
+<a href="{{ site_url() }}blog/category/release">{{ _('Release Notes') }}</a>
+</li><li>
+<a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/history.txt">{{ _('Change Log') }}</a>
+</li></ul>
+
+<div class="downloadlist">
+
+    <h5>{%- trans %}I2P for Mac OSX{%- endtrans %}</h5>
+{% call package('mac') %}
+    <p>{% trans i2pversion=ver() -%}
+    The most reliable way to launch the installer is from a terminal like this:
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar</code>. This will launch the GUI installer.
+    Depending on how your computer is set up, you may be able to start the
+    installer by double-clicking the &quot;i2pinstall_{{ i2pversion }}.jar&quot; file or
+    right-clicking the file and selecting &quot;Open with Java&quot;.
+    Unfortunately, this behaviour is difficult to predict.
+    {%- endtrans %}</p>
+
+    <h3>{% trans %}Command line (headless) install:{% endtrans %}</h3>
+    {% trans i2pversion=ver() -%}
+    I2P can also be installed in a terminal environment, which may be especially
+    useful for servers, containers, or certain virtual machines. If you wish to
+    use the installer without a GUI, you can use the command 
+    <code>java -jar i2pinstall_{{ i2pversion }}.jar -console</code> to follow
+    the install procedure in your terminal.
+    {%- endtrans %}
+
+    <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">
+        <a class="default" href="{{ get_url('downloads_mac') }}">{% trans %}Mac OS DMG Bundle (BETA){% endtrans %}</a>
+    </div>
+{% endcall %}
+
+{% endblock %}

i2p2www/pages/downloads/download_ubuntu.html

@@ -0,0 +1,149 @@
+{% extends "global/layout.html" %}
+{% block title %}Debian/Ubuntu{% endblock %}
+{% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
+<ul>
+<li><a href="/download_windows">Windows</a>
+<li><a href="/download_osx">Mac OS X</a>
+<li><a href="/download_linux">GNU/Linux / BSD / Solaris</a>
+<li><a href="/download_debian">Ubuntu</a>
+<li><a href="/download_debian">Debian</a>
+<li><a href="/download_android">Android</a>
+<li><a href="/download_docker">Docker</a>
+<li><a href="/download_source">{{ _('Source package') }}</a>
+<li><a href="/download_update">{{ _('Manual updates') }}</a>
+</ul>
+{% endblock %}
+{% block content %}
+<h1>{{ _('Debian I2P Packages') }}</h1>
+
+<h2 id="bionic">{{ _('Debian Buster, Ubuntu Bionic, and later') }}</h2>
+{% trans -%}
+I2P is available in the official repositories for Ubuntu Bionic and later, and Debian Buster and Sid.
+However, Debian Buster and Ubuntu Bionic (LTS) distributions will have older I2P versions.
+If you are not running Debian Sid or the latest Ubuntu release,
+use our Debian repo or Launchpad PPA to ensure you're running the latest I2P version.
+{%- endtrans %}
+
+<h2 id="others">{{ _('Debian or Ubuntu, All Versions') }}</h2>
+{% trans -%}The Debian packages should work on most platforms running:{%- endtrans %}
+<ul>
+  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Precise <em>12.04</em> and newer){% endtrans %}</li>
+  <li><a href="#ubuntu">Mint</a></li>
+  <li>{% trans %}<a href="#debian">Debian Linux</a> (Wheezy and newer){% endtrans %}</li>
+  <li><a href="#debian">Knoppix</a></li>
+</ul>
+
+{% trans trac='http://trac.i2p2.de/newticket?component=package/debian&owner=killyourtv&cc=killyourtv@mail.i2p' -%}
+The I2P packages <em>may</em> work on systems not listed above. Please report any issues
+with these packages on <a href="{{ trac }}">Trac</a> at
+<a href="{{ trac }}">https://trac.i2p2.de</a>.
+{%- endtrans %}
+<ul>
+  <li>{% trans %}Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<em>Try this if you're not using Debian)</em>{% endtrans %}</li>
+  <li>{% trans %}Option 2: <a href="#debian">Debian</a> (including Debian-derivatives){% endtrans %}</li>
+</ul>
+
+<h2 id="ubuntu">{{ _('Instructions for Ubuntu and derivatives like Linux Mint &amp; Trisquel') }}</h2>
+<h5>{{ _('Adding the PPA via the command line and installing I2P') }}</h5>
+<ol>
+  <li>
+    {% trans %}Open a terminal and enter:{% endtrans %}<br />
+    <code>&nbsp;&nbsp;&nbsp; sudo apt-add-repository ppa:i2p-maintainers/i2p</code><br />
+{% trans -%}
+This command will add the PPA to /etc/apt/sources.list.d and fetch the
+gpg key that the repository has been signed with. The GPG key ensures
+that the packages have not been tampered with since being built.
+{%- endtrans %}
+  </li>
+  <li>
+    {% trans %}Notify your package manager of the new PPA by entering:{% endtrans %}<br />
+    <code>&nbsp;&nbsp;&nbsp; sudo apt-get update</code><br />
+{% trans -%}
+This command will retrieve the latest list of software from each
+repository that is enabled on your system, including the I2P PPA that
+was added with the earlier command.
+{%- endtrans %}
+  </li>
+  <li>{% trans %}You are now ready to install I2P!{% endtrans %}<br />
+    <code>&nbsp;&nbsp;&nbsp;&nbsp;sudo apt-get install i2p</code></li>
+</ol>
+
+<h5>{{ _('Adding the PPA Using Synaptic') }}</h5>
+<ol>
+  <li>
+    {% trans -%}
+    Open Synaptic (System -&gt; Administration -&gt; Synaptic Package Manager).
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    Once Synaptic opens, select <em>Repositories</em> from the <em>Settings</em> menu.
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    Click the <em>Other Sources</em> tab and click <em>Add</em>. Paste <code>ppa:i2p-maintainers/i2p</code> into the APT-line field and click <em>Add Source</em>. Click the <em>Close</em> button then <em>Reload</em>.
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <em>Mark for Installation</em>. After doing so you may see a <em>Mark additional required changes?</em> popup. If so, click <em>Mark</em> then <em>Apply</em>.
+    {%- endtrans %}
+  </li>
+</ol>
+
+{% trans -%}
+After the installation process completes you can move on to the next
+part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
+{%- endtrans %}
+
+<h2 id="Post-install_work">{{ _('Post-install work') }}</h2>
+
+{% trans -%}
+Using these I2P packages the I2P router can be started in the following
+three ways:
+{%- endtrans %}
+<ul>
+  <li>
+    {% trans -%}
+    &quot;on demand&quot; using the i2prouter script. Simply run &quot;<code>i2prouter
+start</code>&quot; from a command prompt. (Note: Do <strong><u>not</u></strong> use
+sudo or run it as root!)
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    &quot;on demand&quot; without the <a href="http://wrapper.tanukisoftware.com/">java service wrapper</a>
+(needed on non-Linux/non-x86 systems) by running "<code>i2prouter-nowrapper</code>".
+(Note: Do <strong><u>not</u></strong>
+use sudo or run it as root!)
+    {%- endtrans %}
+  </li>
+  <li>
+    {% trans -%}
+    as a service that automatically runs when your system boots, even
+before logging in. The service can be enabled with "<code>dpkg-reconfigure
+i2p</code>" as root or using sudo. This is the recommended means of operation.
+    {%- endtrans %}
+  </li>
+</ul>
+
+<p>{% trans -%}
+When installing for the first time, please remember to <b>adjust your NAT/firewall</b>
+if you can. The ports to forward can be found on the <a href="http://127.0.0.1:7657/confignet">
+network configuration page</a> in the router console. If guidance with respect to forwarding ports is needed,
+you may find <a href="http://portforward.com">portforward.com</a> to be helpful.
+{%- endtrans %}</p>
+
+<p>{% trans -%}
+Please review and <b>adjust the bandwidth settings</b> on the
+<a href="http://127.0.0.1:7657/config.jsp">configuration page</a>,
+as the default settings of 96 KB/s down / 40 KB/s up are fairly conservative.
+{%- endtrans %}</p>
+
+<p>{% trans browserconfig=site_url('about/browser-config') -%}
+If you want to reach I2P Sites via your browser, have a look on the <a href="{{ browserconfig }}">browser proxy setup</a> page for an easy howto.
+{%- endtrans %}</p>
+
+{% endblock %}

i2p2www/pages/downloads/download_windows.html

@@ -0,0 +1,95 @@
+{% extends "global/layout.html" %}
+{%- from "downloads/macros" import package, package_outer with context -%}
+
+{% set release_signer = 'zzz' %}
+
+{% block title %}{{ _('Download') }}{% endblock %}
+{% block content_nav %}
+<script type="text/javascript" src="/_static/site.js"></script>
+<ul>
+<li><a href="/download_windows">Windows</a>
+<li><a href="/download_osx">Mac OS X</a>
+<li><a href="/download_linux">GNU/Linux / BSD / Solaris</a>
+<li><a href="/download_debian">Ubuntu</a>
+<li><a href="/download_debian">Debian</a>
+<li><a href="/download_android">Android</a>
+<li><a href="/download_docker">Docker</a>
+<li><a href="/download_source">{{ _('Source package') }}</a>
+<li><a href="/download_update">{{ _('Manual updates') }}</a>
+</ul>
+{% endblock %}
+
+{% block content %}
+<!--<h3>{{ _('Lab') }}</h3>
+{% trans lab='/lab' %}
+If you would like to try the latest experimental I2P projects, visit the <a href = "{{ lab }}">I2P Lab</a>
+{% endtrans -%}-->
+<h3>{{ _('Getting Started') }}</h3>
+<h4>{% trans %}Basic Steps{% endtrans %}</h4>
+<p>{% trans %}For most platforms and systems, setting I2P installed and running will
+consist of up to three steps.{% endtrans %}</p>
+<ul>
+  <li><strong>{% trans %}Install Java: {% endtrans %}</strong>{% trans java='https://java.com/download/',
+openjdk='http://openjdk.java.net/install/',
+icedtea='http://icedtea.classpath.org/wiki/Main_Page',
+arm8='https://openjdk.java.net/install/',
+ibmsdk7='http://www.ibm.com/developerworks/java/jdk/linux/download.html',
+detectjre='https://java.com/en/download/installed.jsp?detect=jre&amp;try=1' %} I2P is written in Java and requires
+a Java system to be installed to run. In addition to the I2P download, you need to install Java if you do not have it 
+already installed. I2P requires Java Runtime Version 7 or higher.
+(<a href="{{ java }}">Oracle</a>,
+<a href="{{ openjdk }}">OpenJDK</a>, or
+<a href="{{ icedtea }}">IcedTea</a>
+Java Version 7 or 8 recommended,
+except Raspberry Pi: <a href="{{ arm8 }}">OpenJDK 9 for ARM</a>,
+PowerPC: <a href="{{ ibmsdk7 }}">IBM Java SE 7 or 8</a>)
+<br />
+<a href="{{ detectjre }}">Determine your installed Java version here</a>
+or type <tt>java -version</tt> at your command prompt.
+Only two platforms do not require Java to be installed before I2P is installed, those platforms are:{% endtrans %}</li>
+  <li><strong>{% trans %}Install I2P: {% endtrans %}</strong>{% trans %}Once you have Java installed, you should
+run the I2P installer for your platform. This step applies to all systems.{% endtrans %}</li>
+  <li><strong>{% trans %}Install/Configure a Browser(Optional): {% endtrans %}</strong>{% trans %}Finally, you'll need to
+configure applications to use I2P. Many applications can use I2P, but the first application most people configure is a Web
+Browser for browsing I2P sites. Detailed instructions are available on the{% endtrans %}
+<a href="{{ site_url() }}about/browser-config">{% trans %}Browser Page{% endtrans %}</a>.</li>
+</ul><p>
+{% trans -%}
+Windows: Java 8 is recommended. Java 9 or higher may not work.
+{%- endtrans %}
+</p>
+
+
+
+<h3>{{ _('Release Notes') }}</h3>
+<ul><li>
+<a href="{{ site_url() }}blog/category/release">{{ _('Release Notes') }}</a>
+</li><li>
+<a href="https://raw.githubusercontent.com/i2p/i2p.i2p/master/history.txt">{{ _('Change Log') }}</a>
+</li></ul>
+
+
+<div class="downloadlist">
+
+    <h5>{%- trans %}I2P for Windows{%- endtrans %}</h5>
+    {% call package('windows') %}
+    <p>{% trans -%}
+    After installing Java, download the file and double-click to run it.
+    {%- endtrans %}</p>
+    <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>
+    </div>
+    <h3>{% trans %}Detailed Install Guide{% endtrans %}</h3>
+    <div class="file">
+      <p></p>
+      <a class="default" href="{{ get_url('downloads_windows') }}">{% trans %}Here is a helpful guide to installing I2P for Windows using a separate Java installation and the classic installer.{% endtrans %}</a>
+    </div>
+{% endcall %}
+
+{% endblock %}

i2p2www/pages/downloads/list.html

@@ -81,18 +81,18 @@ Windows: Java 8 is recommended. Java 9 or higher may not work.
 <h3>{{ _('Pick your I2P Bundle') }}</h3>
 
 <p>
-When you download the I2P software bundle, you get everything you need to connect
+{% trans %}When you download the I2P software bundle, you get everything you need to connect
 and start participating in the I2P network and community. It even includes basic
 applications for every user, like e-mail, bittorrent, and a basic I2P Site for
-you to personalize and share.
+you to personalize and share.{% endtrans %}
 </p>
 
-<p>After you've installed, a set up wizard will help you configure a few
+<p>{% trans %}After you've installed, a set up wizard will help you configure a few
 important things like how much bandwidth you would like to share while your
 router begins to make connections to the network. After the set up wizard is
 complete, you will be directed to the console home page where you can access
 the rest of the applications or configure, monitor, or troubleshoot your
-I2P connections.</p>
+I2P connections.{% endtrans %}</p>
 
 <div class="downloadlist">
 

i2p2www/pages/downloads/mac.html

@@ -22,7 +22,8 @@ you to complete the bandwidth setup wizard.
 <p>{% trans browser="https://geti2p.net/htproxyports" -%}
 If you want to browse hidden websites ('eepsites') on the I2P network, you need
 to configure your browser. Instructions for configuring a range of browsers are
-available on <a href="{{ browser }}">the browser configuration page</a>.
+available on <a href="{{ browser }}">the browser configuration
+page</a>.
 {%- endtrans %}</p>
 <h2>{{ _('Why should I use it?') }}</h2>
 <p>{% trans -%}
@@ -34,7 +35,7 @@ it makes I2P easier to install and work with on Apple computers by using tools
 that are familiar and built-into the operating system.
 {%- endtrans %}</p>
 
-{%- set name     = 'Mac' -%}
+{%- set name     = 'Windows' -%}
 {%- set icon     = 'images/download/mac-osx.png' -%}
 {%- set filename = 'I2P-%s.dmg' -%}
 {%- set hash     = '07c729c26fc8a31c0e74fe7b4de7be1f8e390d018748322ada35b29de9d' -%}

i2p2www/pages/site/docs/reseed.html

@@ -1,36 +1,61 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Reseed Hosts{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}January 2016{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.24{% endblock %}
+{% block lastupdated %}{% trans %}September 2021{% endtrans %}{% endblock %}
+{% block accuratefor %}1.5.0{% endblock %}
 {% block content %}
 
 
 <h2 id="about">{% trans %}About Reseed hosts{% endtrans %}</h2>
 
 <p>{% trans -%}
-Reseed hosts are needed to for bootstrapping, that is, providing the initial set of I2P nodes for your I2P node to talk to. Depending on the status of your node it may need to bootstrap every now and then if many of the nodes it knows of aren't contactable.
+Reseed hosts are needed to for bootstrapping, that is, providing the initial set
+of I2P nodes for your I2P node to talk to. Depending on the status of your node
+it may need to bootstrap every now and then if many of the nodes it knows of
+aren't contactable.
 {%- endtrans %}</p>
 
 <p>{% trans -%}
-Reseeding is done over an encrypted connection and all of the bootstrap information is signed by the reseed host you connect to, making it impossible for an unauthenticated source to provide you with false information.
+Reseeding is done over an encrypted connection and all of the bootstrap
+information is signed by the reseed host you connect to, making it impossible
+for an unauthenticated source to provide you with false information.
 {%- endtrans %}</p>
 
 
 <h2 id="running">{% trans %}Running a Reseed host{% endtrans %}</h2>
 <p>
-{% trans -%}
-The more reseed hosts that are run, the more resilient the I2P network becomes, and the harder it is to prevent users of I2P from connecting to the network.
+{% trans -%}Operating a reseed server can be accessible to any sysadmin familiar
+with I2P, and we encourage new reseed operators to get in contact with us at
+<a href="http://zzz.i2p">the development forums</a>. The more reseed hosts that
+are run, the more resilient the I2P network becomes, and the harder it is to
+prevent users of I2P from connecting to the network.
 {%- endtrans %}
 </p>
-{% trans -%}
-There have also been cases where the reseed hosts we had, have been under heavy load due to botnet activities.
-{%- endtrans %}
-</p>
-<p>
-<a href="{{ site_url('get-involved/guides/reseed') }}">How to run a Reseed host</a>
-</p>
 
-<h2 id="thank you">{% trans %}Thank you{% endtrans %}</h2>
+<ul>
+<li><a href="{{ site_url('get-involved/guides/reseed') }}">Reseed Contributors Guide</a></li>
+<li><a href="https://i2pgit.org/idk/reseed-tools">Reseed Software and Documentation</a></li>
+</ul>
+
+<h2 id="other">{% trans %}Other ways of Reseeding{% endtrans %}</h2>
+
+<p>
+{% trans -%}
+In order to make I2P more reslient, other kinds of reseeding are possible. One
+important way of carrying out a reseed is the file-based reseed, where a user
+with a running I2P router generates a reseed file for a friend and transfers it
+to them as a .zip file. Others use cloud-based infrastructure to resist
+censorship. These reseed methods provide functionality which aids people in
+situations where reseeds are restricted.
+{%- endtrans %}
+</p>
+
+<ul>
+<li><a href="{{ site_url('blog/post/2020/06/07/file-based-reseed') }}">File Based Reseed</a></li>
+<li><a href="https://homepage.np-tokumei.net/post/notes-i2p-reseed-over-cloudflare/">I2P Reseed over Cloudflare</a></li>
+<li><a href="https://homepage.np-tokumei.net/post/notes-censorship-resistant-i2p-reseeding/">Censorship Resistant I2P Reseeding</a></li>
+</ul>
+
+<h2 id="thank you">{% trans %}Thank you Reseed Operators{% endtrans %}</h2>
 <p>
 {%-trans -%}
 If you are running a reseed server, We would like to thank you for helping to

i2p2www/sitemap.py

@@ -124,6 +124,27 @@ def render_sitemap():
     urls.append({
         'path': '/download/windows',
         })
+    urls.append({
+        'path': '/download/download_windows',
+        })
+    urls.append({
+        'path': '/download/download_osx',
+        })
+    urls.append({
+        'path': '/download/download_linux',
+        })
+    urls.append({
+        'path': '/download/download_debian',
+        })
+    urls.append({
+        'path': '/download/download_ubuntu',
+        })
+    urls.append({
+        'path': '/download/download_android',
+        })
+    urls.append({
+        'path': '/download/download_docker',
+        })
     # Render and return the sitemap
     response = make_response(render_template('global/sitemap.xml', url_root=url_root, langs=LANG_FRAGS,
                                              curlang=to_url(g.lang), urls=urls))

i2p2www/urls.py

@@ -92,6 +92,13 @@ 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/download_windows', 'downloads.downloads_windows_only')
+url('/<lang:lang>/download/download_osx', 'downloads.downloads_osx_only')
+url('/<lang:lang>/download/download_linux', 'downloads.downloads_linux_only')
+url('/<lang:lang>/download/download_ubuntu', 'downloads.downloads_ubuntu_only')
+url('/<lang:lang>/download/download_debian', 'downloads.downloads_debian_only')
+url('/<lang:lang>/download/download_android', 'downloads.downloads_android_only')
+url('/<lang:lang>/download/download_docker', 'downloads.downloads_docker')
 url('/<lang:lang>/download/easyinstall', 'downloads.downloads_easyinstall')
 url('/<lang:lang>/download/nsis', 'downloads.downloads_easyinstall')
 url('/<lang:lang>/download/firefox', 'downloads.downloads_firefox')