kytv/I2P_Website
1
0
Fork 0
forked from I2P_Developers/i2p.www
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved debian page into downloads, hard-coded it into downloads_select()

Browse Source
This commit is contained in:
str4d
2012-11-10 05:53:24 +00:00
parent 37fcb6c206
commit d9bec35b61
5 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
i2p2www/__init__.py
View File

@@ -252,6 +252,8 @@ def downloads_list():
@app.route('/<string:lang>/download/<path:file>')
def downloads_select(file):
# TODO: implement
if (file == 'debian'):
return render_template('downloads/debian.html')
pass
@app.route('/download/<string:protocol>/any/<path:file>')

113
i2p2www/pages/downloads/debian.html Normal file
View File

@@ -0,0 +1,113 @@
{% extends "global/layout.html" %}
{% block title %}Debian/Ubuntu{% endblock %}
{% block content %}
<h1>Debian I2P Packages</h1>
The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archive/i2p">the I2P Launchpad site</a>
have been tested and <span style="font-style: italic;">should </span>work on x86/x86_64 platforms running
<ul>
<li><a href="#ubuntu">Ubuntu</a> (Hardy <span style="font-style: italic;">8.04</span> and newer)</li>
<li><a href="#ubuntu">Mint</a> <span style="font-style: italic;">11</span></li>
<li><a href="#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy)</li>
<li><a href="#debian">Knoppix</a></li>
<li><a href="#debian">Simply MEPIS</a> <span style="font-style: italic;">8.5.03-rel1</span></li>
<li><a href="#ubuntu">Trisque</a>l <span style="font-style: italic;">4.5.1</span></li>
<li><a href="#debian">gNewSense</a> <span style="font-style: italic;">2.3</span></li>
<li><a href="#nonlinux">Nexenta</a> <span style="font-style: italic;">3.0.1</span></li>
</ul>
The I2P packages <span style="font-style: italic;">may</span> work on systems not listed above. Please report any issues with these packages on <a href="http://trac.i2p2.de/">Trac</a> at <a href="http://trac.i2p2.de">http://trac.i2p2.de</a>.
<ul>
<li>Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<span style="font-style: italic;">Try this if you're not using Debian)</span></li>
<li>Option 2: <a href="#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu)</li>
<li>Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures)</li>
</ul>
<h2 id="ubuntu">Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel</h2>
<h5>Adding the PPA via the command line and installing I2P</h5>
<ol>
<li>Open a terminal and enter: <br />
<code>&nbsp;&nbsp;&nbsp; sudo apt-add-repository ppa:i2p-maintainers/i2p</code><br />
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.</li>
<li>Notify your package manager of the new PPA by entering<br />
<code>&nbsp;&nbsp;&nbsp; sudo apt-get update</code><br />
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.</li>
<li>You are now ready to install I2P! <br />
<code>&nbsp;&nbsp;&nbsp;&nbsp;sudo apt-get install i2p</code></li>
</ol>
<h5>Adding the PPA Using Synaptic</h5>
<ol>
<li>Open Synaptic (System -> Administration -> Synaptic Package Manager).</li>
<li>Once Synaptic opens, select <span style="font-style: italic;">Repositories</span> from the <span style="font-style: italic;">Settings</span> menu.</li>
<li>Click the <span style="font-style: italic;">Other Sources</span> tab and click <span style="font-style: italic;">Add</span>. Paste <code>ppa:i2p-maintainers/i2p</code> into the APT-line field and click <span style="font-style: italic;">Add Source</span>. Click the <span style="font-style: italic;">Close</span> button then <span style="font-style: italic;">Reload</span>.</li>
<li>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 <span style="font-style: italic;">Mark for Installation</span>. After doing so you may see a <span style="font-style: italic;">Mark additional required changes?</span> popup. If so, click <span style="font-style: italic;">Mark</span> then <span style="font-style: italic;">Apply</span>.</li>
</ol>
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.
<h2 id="debian">Instructions for Debian Lenny and newer</h2>
The steps below should be performed with root access (i.e., switching
user to root with "su" or by prefixing each command with "sudo").
<ol>
<li>Add the GPG key that signs the repository with the following command:<br />
&nbsp;&nbsp;&nbsp; <code>apt-key adv --keyserver keyserver.ubuntu.com --recv-keys <a href="http://keyserver.ubuntu.com:11371/pks/lookup?search=0x474BC46576FAE76E97C1A1A1AB9660B9EB2CC88B&amp;op=index">EB2CC88B</a></code><br />
You'll have output like the following if the command was successful: <br />
&nbsp;&nbsp;&nbsp;&nbsp;<img src="/_static/images/add-key-terminal.png" alt="" /></li>
<li>For Debian Oldstable (Lenny) and Stable (Squeeze): Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code><br />
<code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main <br />
&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main </code><br />
<br />
For Debian Testing (Wheezy) or Unstable (Sid), use the following: <br />
<code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main <br />
&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br /></li>
<li>Notify your package manager of the new PPA by entering<br />
<code>&nbsp;&nbsp;&nbsp; apt-get update</code><br />
This command will retrieve the latest list of software from every
repository enabled on your system, including the I2P PPA added in step
1.</li>
<li>You are now ready to install I2P! <br />
<code>&nbsp;&nbsp;&nbsp; apt-get install i2p</code></li>
</ol>
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.
<h2 id="nonlinux">Instructions for Non-Linux / Non-x86</h2>
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>").<br />
<ol>
<li>Download the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a> package from the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.</li>
<li>Make sure that you have Java installed. Running <span style="font-style: italic;"><code>apt-get install default-jre</code></span> should be sufficient.<br />
You are now ready to install I2P! <br />
<code>&nbsp;&nbsp;&nbsp; dpkg -i i2p-router_*.deb</code></li>
<li>It is recommended to compile <a href="/jbigi">jbigi</a> for your system to achieve better performance. Instructions are available <a href="/jbigi">here</a>.</li>
</ol>
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.
<h2 id="Post-install_work">Post-install work</h2>
Using these I2P packages the I2P router can be started in the following
three ways:
<ul>
<li>"on demand" using the i2prouter script. Simply run &quot;<code>i2prouter
start</code>&quot; from a command prompt. (Note: Do <span style="font-weight: bold; text-decoration: underline;">not</span> use
sudo or run it as root!)</li>
<li>"on demand" 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 <span style="font-weight: bold; text-decoration: underline;">not</span>
use sudo or run it as root!)</li>
<li>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.</li>
</ul>
<p>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 <a href="http://www.portforward.com">portforward.com</a> to be helpful.
</p>
<p>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.
</p>
<p>
If you want to reach eepsites via your browser, have a look on the <a href="htproxyports.html">browser proxy setup</a> page for an easy howto.</p>
{% endblock %}

2
i2p2www/pages/downloads/list.html
View File

@@ -37,7 +37,7 @@ or type <tt>java -version</tt> at your command prompt.
run <code>java -jar i2pinstall_0.9.3.jar -console</code> from the command line.
</li>
<li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>
<li><a href="{{ url_for('downloads_select', lang=g.lang, file='debian') }}">Packages for Debian &amp; Ubuntu</a></li>
<li><b>Source install:</b><br />
<a href="http://mirror.i2p2.de/i2psource_0.9.3.tar.bz2">i2psource_0.9.3.tar.bz2</a>

1
i2p2www/pages/global/macros
View File

@@ -7,6 +7,7 @@
{%- if request.endpoint == 'site_show' -%}{{ url_for('site_show', lang=lang, page=page) }}
{%- elif request.endpoint == 'blog_entry' -%}{{ url_for('blog_entry', lang=lang, slug=slug) }}
{%- elif request.endpoint == 'meetings_show' -%}{{ url_for('meetings_show', lang=lang, id=id) }}
{%- elif request.endpoint == 'downloads_select' -%}{{ url_for('downloads_select', lang=lang, file=file) }}
{%- elif request.endpoint -%}{{ url_for(request.endpoint, lang=lang) }}
{%- else -%}{{ url_for('site_show', lang=lang) }}
{%- endif -%}

2
i2p2www/pages/global/nav.html
View File

@@ -5,7 +5,7 @@
<li><a href="{{ url_for('downloads_list', lang=g.lang) }}"><span>{{ _('Download I2P') }}</span></a></li>
<li><a href="#"><span>{{ _('Windows installer') }}</span></a></li>
<li><a href="#"><span>{{ _('Linux / OS X / BSD / Solaris installer') }}</span></a></li>
<li><a href="#"><span>{{ _('Debian / Ubuntu packages') }}</span></a></li>
<li><a href="{{ url_for('downloads_select', lang=g.lang, file='debian') }}"><span>{{ _('Debian / Ubuntu packages') }}</span></a></li>
<li><a href="#"><span>{{ _('Source package') }}</span></a></li>
</ul>
</li>