Browse code

revisit the debian instructions to include ubuntu distros to stop confusing users with their crazy animals.

Andrew Lewman authored on 21/10/2010 00:45:09
Showing 1 changed files
... ...
@@ -10,173 +10,183 @@
10 10
     <a href="<page docs/debian>">Debian/Ubuntu Instructions</a>
11 11
   </div>
12 12
   <div id="maincol"> 
13
-    <a id="debian"></a>
14
-    <h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny,
15
-    Debian sid, or Debian testing</a></h2>
16
-    <br>
17
-    
18
-    <p>
19
-    If you're using Debian stable (lenny), unstable (sid), or testing
20
-    (squeeze), just run<br>
21
-    <tt>apt-get install tor tor-geoipdb</tt>
22
-    as root.
23
-    </p>
24
-    
25
-    <p>
26
-    Note that this might not always give you the latest stable Tor version, but
27
-    you will receive important security fixes. To make sure that you're running
28
-    the latest stable version of Tor, see option two below.
29
-    </p>
30
-    
31
-    <p>
32
-    Now Tor is installed and running. Move on to <a href="<page
33
-    docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
34
-    instructions.
35
-    </p>
36
-    
37
-    <hr>
38
-    
39
-    <a id="ubuntu"></a>
40
-    <a id="packages"></a>
41
-    <h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or
42
-    Debian</a></h2>
43
-    <br>
44
-    
45
-    <p>
46
-    <b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
47
-    and out of date. That means you'll be missing stability and security
48
-    fixes.
49
-    </p>
50
-    
51
-    <p>
52
-    You'll need to set up our package repository before you can fetch
53
-    Tor. First, you need to figure out the name of your distribution. If
54
-    you're using Ubuntu 9.10 or 10.04, it's  "karmic", while 9.04 is "jaunty",
55
-    8.10 is "intrepid", and 8.04 is "hardy". If you're using Debian
56
-    Etch, it's "etch", and Debian Lenny is "lenny". Then add this line to your
57
-    <tt>/etc/apt/sources.list</tt>
58
-    file:<br>
59
-    <pre>
60
-    deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
61
-    </pre>
62
-    where you put the codename of your distribution (i.e. etch, lenny, sid, karmic,
63
-    jaunty, intrepid, hardy or whatever it is) in place of &lt;DISTRIBUTION&gt;.
64
-    </p>
65
-    
66
-    <p>
67
-    Then add the gpg key used to sign the packages by running the following
68
-    commands at your command prompt:
69
-    <pre>
70
-    gpg --keyserver keys.gnupg.net --recv 886DDD89
71
-    gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
72
-    </pre>
73
-    Now refresh your sources and install Tor by running the following
74
-    commands at your command prompt:
75
-    <pre>
76
-    apt-get update
77
-    apt-get install tor tor-geoipdb
78
-    </pre>
79
-    </p>
80
-    
81
-    <p>
82
-    Now Tor is installed and running. Move on to <a href="<page
83
-    docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
84
-    instructions.
85
-    </p>
86
-    
87
-    <p style="font-size: small">
88
-    The DNS name <code>deb.torproject.org</code> is actually a set of independent
89
-    servers in a DNS round robin configuration.  If you for some reason cannot
90
-    access it you might try to use the name of one of its part instead.  Try
91
-    <code>deb-master.torproject.org</code>,
92
-    <code>mirror.netcologne.de</code> or
93
-    <code>tor.mirror.youam.de</code>.
94
-    </p>
95
-    
96
-    <hr>
97
-    
98
-    <a id="development"></a>
99
-    <h2><a class="anchor" href="#development">Option three: Using the
100
-    development branch of Tor on Debian or Ubuntu</a></h2>
101
-    <br>
102
-    
103
-    <p>If you want to use the <a href="<page
104
-    download/download>#packagediff">development branch</a> of Tor instead (more
105
-    features and more bugs), you need to add a different set of lines to
106
-    your <tt>/etc/apt/sources.list</tt> file:<br>
107
-    <pre>
108
-    deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
109
-    deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
110
-    </pre>
111
-    where you again substitute the name of your distro (etch, lenny, sid, karmic,
112
-    jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
113
-    </p>
114
-    
115
-    <p>
116
-    Then run the following commands at your command prompt:
117
-    <pre>
118
-    gpg --keyserver keys.gnupg.net --recv 886DDD89
119
-    gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
120
-    apt-get update
121
-    apt-get install tor tor-geoipdb
122
-    </pre>
123
-    </p>
124
-    
125
-    <p>
126
-    Now Tor is installed and running. Move on to <a href="<page
127
-    docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
128
-    instructions.
129
-    </p>
130
-    
131
-    <hr>
132
-    
133
-    <a id="source"></a>
134
-    <h2><a class="anchor" href="#source">Building from source</a></h2>
135
-    <br>
136
-    
137
-    <p>
138
-    If you want to build your own debs from source you must first add an
139
-    appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
140
-    <pre>
141
-    # For the stable version.
142
-    deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
143
-    
144
-    # For the unstable version.
145
-    deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
146
-    deb-src http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
147
-    </pre>
148
-    You also need to install the necessary packages to build your own debs and the
149
-    packages needed to build Tor:
150
-    <pre>
151
-    apt-get install build-essential fakeroot devscripts
152
-    apt-get build-dep tor
153
-    </pre>
154
-    Then you can build Tor in ~/debian-packages:
155
-    <pre>
156
-    mkdir ~/debian-packages; cd ~/debian-packages
157
-    apt-get source tor
158
-    cd tor-*
159
-    debuild -rfakeroot -uc -us
160
-    cd ..
161
-    </pre>
162
-    Now you can install the new package:
163
-    <pre>
164
-    sudo dpkg -i tor_*.deb
165
-    </pre>
166
-    </p>
167
-    
168
-    <p>
169
-    Now Tor is installed and running. Move on to <a href="<page
170
-    docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
171
-    instructions.
172
-    </p>
173
-    
174
-    <hr>
175
-    
176
-    <p>If you have suggestions for improving this document, please <a
177
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
13
+<a id="debian"></a>
14
+<h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny,
15
+Debian sid, or Debian testing</a></h2>
16
+<br />
17
+
18
+<p>
19
+If you're using Debian stable (lenny), unstable (sid), or testing
20
+(squeeze), just run<br />
21
+<tt>apt-get install tor tor-geoipdb</tt>
22
+as root.
23
+</p>
24
+
25
+<p>
26
+Note that this might not always give you the latest stable Tor version, but
27
+you will receive important security fixes. To make sure that you're running
28
+the latest stable version of Tor, see option two below.
29
+</p>
30
+
31
+<p>
32
+Now Tor is installed and running. Move on to <a href="<page
33
+docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
34
+instructions.
35
+</p>
36
+
37
+<hr />
38
+
39
+<a id="ubuntu"></a>
40
+<a id="packages"></a>
41
+<h2><a class="anchor" href="#ubuntu">Option two: Tor on Ubuntu or
42
+Debian</a></h2>
43
+<br />
44
+
45
+<p>
46
+<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained
47
+and out of date. That means you'll be missing stability and security
48
+fixes.
49
+</p>
50
+
51
+<p>
52
+You'll need to set up our package repository before you can fetch
53
+Tor. First, you need to figure out the name of your distribution. Here's
54
+a quick mapping:
55
+<ul>
56
+<li> Ubuntu 10.10 is "maverick" but use the "lucid" packages for now</li>
57
+<li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li>
58
+<li> Ubuntu 9.10 or Trisquel 3.5 is  "karmic"</li>
59
+<li> Ubuntu 9.04 is "jaunty"</li>
60
+<li> Ubuntu 8.10 is "intrepid"</li>
61
+<li> Ubuntu 8.04 is "hardy"</li> 
62
+<li> Debian Etch is "etch"</li>
63
+<li> Debian Lenny is "lenny"</li>
64
+</ul>
65
+
66
+Then add this line to your
67
+<tt>/etc/apt/sources.list</tt>
68
+file:<br />
69
+<pre>
70
+deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
71
+</pre>
72
+where you put the codename of your distribution (i.e. etch, lenny, sid, lucid, karmic, jaunty, intrepid, hardy or whatever it is) in place of &lt;DISTRIBUTION&gt;.
73
+</p>
74
+
75
+<p>
76
+Then add the gpg key used to sign the packages by running the following
77
+commands at your command prompt:
78
+<pre>
79
+gpg --keyserver keys.gnupg.net --recv 886DDD89
80
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
81
+</pre>
82
+Now refresh your sources and install Tor by running the following
83
+commands (as root) at your command prompt:
84
+<pre>
85
+apt-get update
86
+apt-get install tor tor-geoipdb
87
+</pre>
88
+</p>
89
+
90
+<p>
91
+Now Tor is installed and running. Move on to <a href="<page
92
+docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
93
+instructions.
94
+</p>
95
+
96
+<p style="font-size: small">
97
+The DNS name <code>deb.torproject.org</code> is actually a set of independent
98
+servers in a DNS round robin configuration.  If you for some reason cannot
99
+access it you might try to use the name of one of its part instead.  Try
100
+<code>deb-master.torproject.org</code>,
101
+<code>mirror.netcologne.de</code> or
102
+<code>tor.mirror.youam.de</code>.
103
+</p>
104
+
105
+<hr />
106
+
107
+<a id="development"></a>
108
+<h2><a class="anchor" href="#development">Option three: Using the
109
+development branch of Tor on Debian or Ubuntu</a></h2>
110
+<br />
111
+
112
+<p>If you want to use the <a href="<page download/download>#packagediff">development branch</a> of Tor instead (more
113
+features and more bugs), you need to add a different set of lines to
114
+your <tt>/etc/apt/sources.list</tt> file:<br />
115
+<pre>
116
+deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
117
+deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
118
+</pre>
119
+where you again substitute the name of your distro (etch, lenny, sid,
120
+lucid, karmic,
121
+jaunty, intrepid, hardy) in place of &lt;DISTRIBUTION&gt;.
122
+</p>
123
+
124
+<p>
125
+Then run the following commands at your command prompt:
126
+<pre>
127
+gpg --keyserver keys.gnupg.net --recv 886DDD89
128
+gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
129
+apt-get update
130
+apt-get install tor tor-geoipdb
131
+</pre>
132
+</p>
133
+
134
+<p>
135
+Now Tor is installed and running. Move on to <a href="<page
136
+docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
137
+instructions.
138
+</p>
139
+
140
+<hr />
141
+
142
+<a id="source"></a>
143
+<h2><a class="anchor" href="#source">Building from source</a></h2>
144
+<br />
145
+
146
+<p>
147
+If you want to build your own debs from source you must first add an
148
+appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.
149
+<pre>
150
+# For the stable version.
151
+deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
152
+
153
+# For the unstable version.
154
+deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
155
+deb-src http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main
156
+</pre>
157
+You also need to install the necessary packages to build your own debs and the
158
+packages needed to build Tor:
159
+<pre>
160
+apt-get install build-essential fakeroot devscripts
161
+apt-get build-dep tor
162
+</pre>
163
+Then you can build Tor in ~/debian-packages:
164
+<pre>
165
+mkdir ~/debian-packages; cd ~/debian-packages
166
+apt-get source tor
167
+cd tor-*
168
+debuild -rfakeroot -uc -us
169
+cd ..
170
+</pre>
171
+Now you can install the new package:
172
+<pre>
173
+sudo dpkg -i tor_*.deb
174
+</pre>
175
+</p>
176
+
177
+<p>
178
+Now Tor is installed and running. Move on to <a href="<page
179
+docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix"
180
+instructions.
181
+</p>
182
+
183
+<hr />
184
+
185
+<p>If you have suggestions for improving this document, please <a
186
+href="<page about/contact>">send them to us</a>. Thanks!</p>
187
+
188
+<!-- END MAIN COL -->
178 189
   </div>
179
-  <!-- END MAINCOL -->
180 190
   <div id = "sidecol">
181 191
 #include "side.wmi"
182 192
 #include "info.wmi"