setting up your own tor network is much simpler now

svn:r2604

1 files changed, 14 insertions, 33 deletions

diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index bdf8a429ea..0a5dbd698b 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -284,7 +284,7 @@ servers, and you need to change the tarball so it points to your directory
 servers rather than the default ones.
 
 <ul>
-<li>1: Grab the latest release.
+<li>1: Grab the latest release. Use at least 0.0.9pre5.
 <li>2: For each directory server you want,
 <ul>
 <li>2a: Set it up as a server (see <a href="#server">"setting up a
@@ -294,43 +294,24 @@ defined.
 <li>2c: Set "RecommendedVersions" to a comma-separated list of acceptable
 versions of the code for clients and servers to be running (see step
 4c below).
-<!-- <li>2d: Create a file called approved-routers in your DataDirectory:
-<tt>touch approved-routers</tt>. It will be empty for now. We'll fill it in
-step 5. -->
-<li>2d: Create an empty dirservers file (<tt>touch dirservers</tt>). Point
-RouterFile at it in your torrc.
-<li>2e: Run it: <tt>tor -f torrc</tt>. This will generate your keys and a
-router.desc (router descriptor) file. It will then exit with a complaint
-that it can't open the fingerprint file; that's fine.
+<li>2d: Run it: <tt>tor --list-fingerprint</tt> if your torrc is in
+the default place, or <tt>tor -f torrc --list-fingerprint</tt> to
+specify one. This will generate your keys and output a fingerprint
+line.
 </ul>
 <li>3: Create the new dirservers file. You do this by concatenating the
 "router.desc" files from each dirserver's DataDirectory: <tt>cat router1.desc
 router2.desc ... &gt; dirservers</tt>
-<li>4: Now you need to teach clients and servers to use the new
-dirservers file. First, check out the tor cvs repository (instructions <a
-href="http://freehaven.net/tor/">here</a> -- be sure to check out the
-tag that matches the version of the code you intend to use; and note that
-the latest cvs version may not compile or work right). Then:
-<ul>
-<li>4a: Edit src/or/config.c and change the default_dirservers_string array
-so that it reflects the contents of the new dirservers file instead
-of the old one. Be sure to get the quotes and newlines and semicolons
-right. (This step sucks. We plan to have it solved by the release of 0.0.9.)
-<li>4b: Replace the dirservers file in your sandbox (in src/config/)
-with the one from step 3.
-<li>4c: edit configure.in, change the AM_INIT_AUTOMAKE(tor, 0.0.8)
-line so that it specifies a version that is specific to you, such as
-0.0.8-arma. This will help you keep from being confused later. Be sure
-to update the RecommendedVersions lines to include this version.
-<li>4d: run <tt>./autogen.sh</tt> (you'll need a new enough set of auto* tools),
-then <tt>make dist</tt>.
-</ul>
+<li>4a: Now you need to teach clients and servers to use the new
+dirservers. For each fingerprint, add a line like<br>
+<tt>DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF</tt><br>
+to the torrc of each client and server who will be using your network.
 <li>5: Create a file called approved-routers in the DataDirectory
-of each directory server. Collect the 'fingerprint' lines from the
-DataDirectory of each server (including directory servers), and include
-them (one per line) in each approved-routers file. You can hup the tor
-process for each directory server to reload the approved-routers file
-(so you don't have to restart the process).
+of each directory server. Collect the 'fingerprint' lines from
+each server (including directory servers), and include them (one per
+line) in each approved-routers file. You can hup the tor process for
+each directory server to reload the approved-routers file (so you don't
+have to restart the process).
 </ul>
 
 <!--<h2>Other doc resources</h2>