diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py index 5a049050..dcad670b 100644 --- a/i2p2www/downloads.py +++ b/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(): diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py index f507b451..75583c00 100644 --- a/i2p2www/legacy.py +++ b/i2p2www/legacy.py @@ -23,6 +23,12 @@ LEGACY_FUNCTIONS_MAP={ 'easyinstall': {'function': 'downloads_easyinstall', 'params': {}}, 'nsis': {'function': 'downloads_easyinstall', 'params': {}}, 'windows': {'function': 'downloads_windows', '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': {}}, diff --git a/i2p2www/pages/downloads/download_android.html b/i2p2www/pages/downloads/download_android.html new file mode 100644 index 00000000..e0b0b5e6 --- /dev/null +++ b/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 %} + +
{% trans %}For most platforms and systems, setting I2P installed and running will +consist of up to three steps.{% endtrans %}
+{% trans -%}
+Note: The steps below should be performed with root access (i.e., switching
+user to root with su
or by prefixing each command with sudo
).
+{%- endtrans %}
apt-transport-https
, curl
, lsb-release
are installed.{%- endtrans %}
+
+
+ sudo apt-get update
+ sudo apt-get install apt-transport-https lsb-release curl
+
+ {{ file2 }}
on your system.
+ Then, for all Current Debian distributions run the following command to create {{ file }}
.{% endtrans %}
+
+ 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
+
+
+
+
+
+ curl -o i2p-archive-keyring.gpg https://geti2p.net/_static/i2p-archive-keyring.gpg
+
+
+
+ gpg --keyid-format long --import --import-options show-only --with-fingerprint i2p-archive-keyring.gpg
+
+
+ {% trans -%}Verify that this key fingerprint matches the output:{%- endtrans %}
+
+
+ 7840 E761 0F28 B904 7535 49D7 67EC E560 5BCF 1346
+
+
+
+ sudo cp ~/i2p-archive-keyring.gpg /usr/share/keyrings
+
+
+
+ sudo apt-get update
+
{% 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 %}
+ i2p-keyring
+ package will ensure that you receive updates to the repository's GPG key.
+ {%- endtrans %}
+
+ sudo apt-get install i2p i2p-keyring
+
+ +{% trans -%} +After the installation process completes you can move on to the next part of starting I2P and configuring it for your system. +{%- endtrans %} +
+ +i2prouter
+start
" from a command prompt. (Note: Do not use
+sudo or run it as root!)
+ {%- endtrans %}
+ i2prouter-nowrapper
".
+(Note: Do not
+use sudo or run it as root!)
+ {%- endtrans %}
+ dpkg-reconfigure
+i2p
" as root or using sudo. This is the recommended means of operation.
+ {%- endtrans %}
+ {% trans -%} +When installing for the first time, please remember to adjust your NAT/firewall +if you can. The ports to forward can be found on the +network configuration page in the router console. If guidance with respect to forwarding ports is needed, +you may find portforward.com to be helpful. +{%- endtrans %}
+ +{% trans -%} +Please review and adjust the bandwidth settings on the +configuration page, +as the default settings of 96 KB/s down / 40 KB/s up are fairly conservative. +{%- endtrans %}
+ +{% trans browserconfig=site_url('about/browser-config') -%} +If you want to reach I2P Sites via your browser, have a look on the browser proxy setup page for an easy howto. +{%- endtrans %}
+ +{% endblock %} diff --git a/i2p2www/pages/downloads/download_linux.html b/i2p2www/pages/downloads/download_linux.html new file mode 100644 index 00000000..d16a70d0 --- /dev/null +++ b/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 %} + +{% trans %}For most platforms and systems, setting I2P installed and running will +consist of up to three steps.{% endtrans %}
+{% trans i2pversion=ver() -%}
+ The most reliable way to launch the installer is from a terminal like this:
+ java -jar i2pinstall_{{ i2pversion }}.jar
. 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 "i2pinstall_{{ i2pversion }}.jar" file or
+ right-clicking the file and selecting "Open with Java".
+ Unfortunately, this behaviour is difficult to predict.
+ {%- endtrans %}
java -jar i2pinstall_{{ i2pversion }}.jar -console
to follow
+ the install procedure in your terminal.
+ {%- endtrans %}
+{% endcall %}
+
+ {% 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 %}
+{% endcall %} + +{% endblock %} diff --git a/i2p2www/pages/downloads/download_osx.html b/i2p2www/pages/downloads/download_osx.html new file mode 100644 index 00000000..f7ffeb4d --- /dev/null +++ b/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 %} + +{% trans %}For most platforms and systems, setting I2P installed and running will +consist of up to three steps.{% endtrans %}
+{% trans i2pversion=ver() -%}
+ The most reliable way to launch the installer is from a terminal like this:
+ java -jar i2pinstall_{{ i2pversion }}.jar
. 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 "i2pinstall_{{ i2pversion }}.jar" file or
+ right-clicking the file and selecting "Open with Java".
+ Unfortunately, this behaviour is difficult to predict.
+ {%- endtrans %}
java -jar i2pinstall_{{ i2pversion }}.jar -console
to follow
+ the install procedure in your terminal.
+ {%- endtrans %}
+
+ sudo apt-add-repository ppa:i2p-maintainers/i2p
sudo apt-get update
sudo apt-get install i2p
ppa:i2p-maintainers/i2p
into the APT-line field and click Add Source. Click the Close button then Reload.
+ {%- endtrans %}
+ i2p
and press enter. When i2p
is returned in the results list, right click i2p
and select Mark for Installation. After doing so you may see a Mark additional required changes? popup. If so, click Mark then Apply.
+ {%- endtrans %}
+ i2prouter
+start
" from a command prompt. (Note: Do not use
+sudo or run it as root!)
+ {%- endtrans %}
+ i2prouter-nowrapper
".
+(Note: Do not
+use sudo or run it as root!)
+ {%- endtrans %}
+ dpkg-reconfigure
+i2p
" as root or using sudo. This is the recommended means of operation.
+ {%- endtrans %}
+ {% trans -%} +When installing for the first time, please remember to adjust your NAT/firewall +if you can. The ports to forward can be found on the +network configuration page in the router console. If guidance with respect to forwarding ports is needed, +you may find portforward.com to be helpful. +{%- endtrans %}
+ +{% trans -%} +Please review and adjust the bandwidth settings on the +configuration page, +as the default settings of 96 KB/s down / 40 KB/s up are fairly conservative. +{%- endtrans %}
+ +{% trans browserconfig=site_url('about/browser-config') -%} +If you want to reach I2P Sites via your browser, have a look on the browser proxy setup page for an easy howto. +{%- endtrans %}
+ +{% endblock %} diff --git a/i2p2www/pages/downloads/download_windows.html b/i2p2www/pages/downloads/download_windows.html new file mode 100644 index 00000000..7151e232 --- /dev/null +++ b/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 %} + +{% trans %}For most platforms and systems, setting I2P installed and running will +consist of up to three steps.{% endtrans %}
++{% trans -%} +Windows: Java 8 is recommended. Java 9 or higher may not work. +{%- endtrans %} +
+ + + +{% trans -%} + After installing Java, download the file and double-click to run it. + {%- endtrans %}
+{% trans %}It's now possible to install all I2P components using + a single package(No Java Required). 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 %}
+ {% trans %}I2P Easy Install Bundle (Beta){% endtrans %} +-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 %}
-After you've installed, a set up wizard will help you configure a few +
{% 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.
+I2P connections.{% endtrans %}