migrate the debian directions to a real web page
Roger Dingledine commited on 2009-07-15 01:00:00
Zeige 5 geänderte Dateien mit 134 Einfügungen und 6 Löschungen.
- docs/en/debian.wml 000000000..4b5148bb2
- docs/en/tor-doc-unix.wml 12f3c895f..adfb0aea2
- en/download-unix.wml 3c642d1b6..b6090028d
- en/verifying-signatures.wml 9cf260f13..48f8b62e3
- fr/easy-download.wml 2940a0282..19b589a1d
| ... | ... |
@@ -0,0 +1,130 @@ |
| 1 |
+## translation metadata |
|
| 2 |
+# Revision: $Revision: 19802 $ |
|
| 3 |
+# Translation-Priority: 3-low |
|
| 4 |
+ |
|
| 5 |
+#include "head.wmi" TITLE="Tor: Debian/Ubuntu Instructions" |
|
| 6 |
+ |
|
| 7 |
+<div class="center"> |
|
| 8 |
+ |
|
| 9 |
+<div class="main-column"> |
|
| 10 |
+ |
|
| 11 |
+<a id="debian"></a> |
|
| 12 |
+<h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny, |
|
| 13 |
+Debian sid, or Debian testing</a></h2> |
|
| 14 |
+<br /> |
|
| 15 |
+ |
|
| 16 |
+<p> |
|
| 17 |
+If you're using Debian stable (lenny), unstable (sid), or testing |
|
| 18 |
+(squeeze), just run<br /> |
|
| 19 |
+<tt>apt-get install tor tor-geoipdb</tt> |
|
| 20 |
+</p> |
|
| 21 |
+ |
|
| 22 |
+<p> |
|
| 23 |
+Now Tor is installed and running. Move on to <a href="<page |
|
| 24 |
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix" |
|
| 25 |
+instructions. |
|
| 26 |
+</p> |
|
| 27 |
+ |
|
| 28 |
+<hr /> |
|
| 29 |
+ |
|
| 30 |
+<a id="ubuntu"></a> |
|
| 31 |
+<a id="packages"></a> |
|
| 32 |
+<h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or |
|
| 33 |
+Debian etch</a></h2> |
|
| 34 |
+<br /> |
|
| 35 |
+ |
|
| 36 |
+<p> |
|
| 37 |
+<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained |
|
| 38 |
+and out of date. That means you'll be missing stability and security |
|
| 39 |
+fixes. |
|
| 40 |
+</p> |
|
| 41 |
+ |
|
| 42 |
+<p> |
|
| 43 |
+You'll need to set up our package repository before you can fetch |
|
| 44 |
+Tor. First, you need to figure out the name of your distribution. If |
|
| 45 |
+you're using Ubuntu 9.04, it's "jaunty". Ubuntu 8.10 is "intrepid", |
|
| 46 |
+and Ubuntu 8.04 is "hardy". If you're using Debian etch, it's "etch". |
|
| 47 |
+Then add these lines to your <tt>/etc/apt/sources.list</tt> file:<br /> |
|
| 48 |
+<pre> |
|
| 49 |
+deb http://mirror.noreply.org/pub/tor <DISTRIBUTION> main |
|
| 50 |
+deb-src http://mirror.noreply.org/pub/tor <DISTRIBUTION> main |
|
| 51 |
+</pre> |
|
| 52 |
+where you substitute the above word (etch, jaunty, intrepid, hardy) |
|
| 53 |
+in place of <DISTRIBUTION>. |
|
| 54 |
+</p> |
|
| 55 |
+ |
|
| 56 |
+<p> |
|
| 57 |
+Then run |
|
| 58 |
+<pre> |
|
| 59 |
+gpg --keyserver keys.gnupg.net --recv 94C09C7F |
|
| 60 |
+gpg --export 94C09C7F | sudo apt-key add - |
|
| 61 |
+apt-get update |
|
| 62 |
+apt-get install tor tor-geoipdb |
|
| 63 |
+</pre> |
|
| 64 |
+<p> |
|
| 65 |
+ |
|
| 66 |
+<p> |
|
| 67 |
+Now Tor is installed and running. Move on to <a href="<page |
|
| 68 |
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix" |
|
| 69 |
+instructions. |
|
| 70 |
+</p> |
|
| 71 |
+ |
|
| 72 |
+<hr /> |
|
| 73 |
+ |
|
| 74 |
+<a id="development"></a> |
|
| 75 |
+<h2><a class="anchor" href="#development">Option three: Using the |
|
| 76 |
+development branch of Tor on Debian or Ubuntu</a></h2> |
|
| 77 |
+<br /> |
|
| 78 |
+ |
|
| 79 |
+<p>If you want to use the <a href="<page |
|
| 80 |
+download>#packagediff">development branch</a> of Tor instead (more |
|
| 81 |
+features and more bugs), you need to add a different set of lines to |
|
| 82 |
+your <tt>/etc/apt/sources.list</tt> file:<br /> |
|
| 83 |
+<pre> |
|
| 84 |
+deb http://mirror.noreply.org/pub/tor <DISTRIBUTION> main |
|
| 85 |
+deb-src http://mirror.noreply.org/pub/tor <DISTRIBUTION> main |
|
| 86 |
+deb http://mirror.noreply.org/pub/tor experimental-0.2.1.x-<DISTRIBUTION> main |
|
| 87 |
+deb-src http://mirror.noreply.org/pub/tor experimental-0.2.1.x-<DISTRIBUTION> main |
|
| 88 |
+</pre> |
|
| 89 |
+where you substitute the name of your distro (etch, lenny, sid, jaunty, |
|
| 90 |
+intrepid, hardy) in place of <DISTRIBUTION>. |
|
| 91 |
+</p> |
|
| 92 |
+ |
|
| 93 |
+<p> |
|
| 94 |
+Then run |
|
| 95 |
+<pre> |
|
| 96 |
+gpg --keyserver keys.gnupg.net --recv 94C09C7F |
|
| 97 |
+gpg --export 94C09C7F | sudo apt-key add - |
|
| 98 |
+apt-get update |
|
| 99 |
+apt-get install tor tor-geoipdb |
|
| 100 |
+</pre> |
|
| 101 |
+<p> |
|
| 102 |
+ |
|
| 103 |
+<p> |
|
| 104 |
+Now Tor is installed and running. Move on to <a href="<page |
|
| 105 |
+docs/tor-doc-unix>#privoxy">step two</a> of the "Tor on Linux/Unix" |
|
| 106 |
+instructions. |
|
| 107 |
+</p> |
|
| 108 |
+ |
|
| 109 |
+<hr /> |
|
| 110 |
+ |
|
| 111 |
+<a id="source"></a> |
|
| 112 |
+<h2><a class="anchor" href="#source">Building from source</a></h2> |
|
| 113 |
+<br /> |
|
| 114 |
+ |
|
| 115 |
+<p> |
|
| 116 |
+If you want to build your own debs from source, see our <a |
|
| 117 |
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian#BuildFromSource">guide |
|
| 118 |
+for building debs</a>. |
|
| 119 |
+</p> |
|
| 120 |
+ |
|
| 121 |
+<hr /> |
|
| 122 |
+ |
|
| 123 |
+<p>If you have suggestions for improving this document, please <a |
|
| 124 |
+href="<page contact>">send them to us</a>. Thanks!</p> |
|
| 125 |
+ |
|
| 126 |
+ </div><!-- #main --> |
|
| 127 |
+</div> |
|
| 128 |
+ |
|
| 129 |
+#include <foot.wmi> |
|
| 130 |
+ |
| ... | ... |
@@ -28,8 +28,7 @@ The latest release of Tor can be found on the <a |
| 28 | 28 |
href="<page download-unix>">download</a> page. We have packages for Debian, |
| 29 | 29 |
Red Hat, Gentoo, *BSD, etc there too. If you're |
| 30 | 30 |
using Ubuntu, don't use the default packages: use <a |
| 31 |
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">our |
|
| 32 |
-deb repository</a> instead. |
|
| 31 |
+href="<page docs/debian>#ubuntu">our deb repository</a> instead. |
|
| 33 | 32 |
</p> |
| 34 | 33 |
|
| 35 | 34 |
<p>If you're building from source, first install <a |
| ... | ... |
@@ -29,7 +29,7 @@ Please take time to read the <a href="<page download-unix>#Warning">warning</a> |
| 29 | 29 |
<tr> |
| 30 | 30 |
<td align="center"><img src="images/distros/debian.png" alt="Debian" /> <img src="images/distros/ubuntu.png" alt="Ubuntu" /> <img src="images/distros/knoppix.png" alt="Knoppix" /></td> |
| 31 | 31 |
<td>Debian, Ubuntu, Knoppix</td> |
| 32 |
-<td colspan="2"><a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">noreply.org packages</a> |
|
| 32 |
+<td colspan="2"><a href="<page docs/debian>">noreply.org packages</a> |
|
| 33 | 33 |
</td> |
| 34 | 34 |
<td> |
| 35 | 35 |
<a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a> |
| ... | ... |
@@ -130,8 +130,7 @@ gpg: BAD signature from "Roger Dingledine <arma@mit.edu>" |
| 130 | 130 |
|
| 131 | 131 |
<p>If you are running Tor on Debian you should read the instructions on |
| 132 | 132 |
<a |
| 133 |
-href="https://wiki.torproject.org/noreply/TheOnionRouter/TorOnDebian">importing |
|
| 134 |
-these keys to apt</a>.</p> |
|
| 133 |
+href="<page docs/debian>#packages">importing these keys to apt</a>.</p> |
|
| 135 | 134 |
|
| 136 | 135 |
</div><!-- #main --> |
| 137 | 136 |
|
| ... | ... |
@@ -7,7 +7,7 @@ |
| 7 | 7 |
|
| 8 | 8 |
<div class="main-column"> |
| 9 | 9 |
|
| 10 |
-<h3>Télécharger maintenant - Gratuit & Logiciel Open Source</h3> |
|
| 10 |
+<h3>Télécharger maintenant - Gratuit & Logiciel Open Source</h3> |
|
| 11 | 11 |
<hr /> |
| 12 | 12 |
<table width="99%" border="0" cellspacing="0" cellpadding="3"> |
| 13 | 13 |
<tr> |
| 14 | 14 |