Commit Graph

336 Commits

Author SHA1 Message Date
Roger Dingledine
75bd472869 do another cleanup pass on the sample torrc
svn:r11168
2007-08-19 00:59:04 +00:00
Roger Dingledine
622dd4927e change the BandwidthRate/BandwidthBurst in the torrc
to RelayBandwidthRate/RelayBandwidthBurst, since that's
what most users will actually want. also flesh out the
torrc.complete entries and fix a few typos. based on
patch from "Armedblowfish".


svn:r10570
2007-06-12 08:19:02 +00:00
Roger Dingledine
64b0d7202e also remove these obsolete torrcs
svn:r10362
2007-05-27 06:07:51 +00:00
Roger Dingledine
1ab216eb2f what the heck is this obsolete dirservers file still doing here?
svn:r10361
2007-05-27 06:06:01 +00:00
Roger Dingledine
f0d7a6716f In the hidden service example in torrc.sample, stop recommending
esoteric and discouraged hidden service options.


svn:r8648
2006-10-08 07:45:16 +00:00
Roger Dingledine
74bf8b1289 man, our sample torrc sucked.
svn:r6964
2006-08-01 04:08:15 +00:00
Peter Palfrader
521c006fd5 Remove .cvsignore files from trunk
svn:r6891
2006-07-25 01:00:48 +00:00
Roger Dingledine
1f407c174d remove the word 'middleman' from the sample torrc
svn:r6703
2006-06-29 13:10:08 +00:00
Roger Dingledine
a4c315f3c3 fix recommended url in torrc.sample for server sign-up
svn:r6626
2006-06-15 22:32:00 +00:00
Roger Dingledine
940b0a4d2e write a better note in torrc.sample about whether to set dirport.
svn:r5978
2006-02-12 01:12:52 +00:00
Roger Dingledine
2e5bd47555 more cleanups on the sample torrc file
svn:r5947
2006-02-09 05:18:03 +00:00
Roger Dingledine
032a01ef64 just because you support the feature does not mean that you
should put an example in the sample torrc file.

the debug-info lines were causing some people to think that
was a smart loglevel to use, and it also always isn't.


svn:r5905
2006-02-04 07:45:40 +00:00
Roger Dingledine
1c4822802f take AllowUnverifiedNodes out of the sample torrc
svn:r5832
2006-01-17 01:09:58 +00:00
Roger Dingledine
1107c40dc0 mention a recommended log level in the sample torrc file
svn:r5731
2006-01-05 10:37:22 +00:00
Roger Dingledine
4f033b0028 make the commenting in the torrc.sample consistent, and try to
explain in it what comments are.


svn:r5711
2006-01-03 00:45:12 +00:00
Peter Palfrader
43c253958e Tor26's IP has changed to 86.59.21.38
svn:r5350
2005-11-05 20:20:51 +00:00
Roger Dingledine
cb785f7b42 fix a url in the sample torrc
svn:r5324
2005-10-27 02:36:52 +00:00
Roger Dingledine
38c6985fff and update the sample torrc to reflect the *listenaddress notation
svn:r5261
2005-10-17 03:23:05 +00:00
Nick Mathewson
2d203fdcf3 link nicknames to trusted directory servers; log these nicknames when mentioning servers; also, when we get a naming conflict; log which nicknames or keys are supposed to bind.
svn:r5184
2005-10-04 21:21:09 +00:00
Roger Dingledine
31c7f59b25 add MyFamily to the torrc.sample
svn:r5133
2005-09-23 20:53:42 +00:00
Nick Mathewson
ebf6476e8e Provide dire warnings to any users who set DirServer; move it out of torrc.sample and into torrc.complete.
svn:r5132
2005-09-23 20:44:22 +00:00
Andrew Lewman
955a10fee0 Initial complete config file. Organized into easily searchable
sections.


svn:r4789
2005-08-16 02:14:40 +00:00
Roger Dingledine
44fe2fa7eb better log examples in the torrc
svn:r4646
2005-07-23 05:14:33 +00:00
Roger Dingledine
495169d316 the abuse faq moved, so change the url
svn:r4629
2005-07-22 06:35:25 +00:00
Roger Dingledine
f2bc79ba89 forward-port with a different version claim
svn:r4608
2005-07-19 21:16:31 +00:00
Roger Dingledine
867cbf1022 and here too
svn:r4561
2005-07-14 22:38:30 +00:00
Roger Dingledine
da7d93e88a make the comment next to RunAsDaemon mention that it is a noop on win32
svn:r4489
2005-06-26 08:59:01 +00:00
Roger Dingledine
5bca8e8b4d forward-port:
## If certain IPs and ports are blocked externally, e.g. by your firewall,
## you should update your exit policy to reflect this -- otherwise Tor
## users will be told that those destinations are down.


svn:r4376
2005-06-09 10:42:25 +00:00
Roger Dingledine
7c8d5c3178 correct some instructions in the sample torrc
svn:r4314
2005-06-06 15:57:53 +00:00
Roger Dingledine
78f26e8806 test out commit mails again
svn:r4281
2005-05-23 03:39:53 +00:00
Roger Dingledine
ee553a9c72 put a tor version at the top of the torrc.sample file
svn:r4280
2005-05-23 03:38:32 +00:00
Roger Dingledine
b7a88ebd15 fix url in comment in torrc
svn:r4225
2005-05-15 03:00:00 +00:00
Roger Dingledine
533a3bbe2e don't point to the 0.0.9.x manual only
svn:r4007
2005-04-04 18:57:16 +00:00
Roger Dingledine
88c9e3959a put a note in the torrc about abuse potential with the default
exit policy.


svn:r4006
2005-04-04 18:56:15 +00:00
Roger Dingledine
452563e157 make slightly clearer that socksport is for local applications
svn:r3901
2005-03-27 11:27:16 +00:00
Nick Mathewson
efb5db449a Describe where to find torrc on OS X
svn:r3889
2005-03-27 01:11:45 +00:00
Roger Dingledine
5d5b12ce75 make example contactinfo entries slightly more spam resistant, since
people are seeing spam to their contactinfo addresses now. (yay.)


svn:r3795
2005-03-21 07:40:25 +00:00
Geoff Goodell
035c8d1b1c added short blurb about ControlPort to sample torrc
svn:r3790
2005-03-19 20:50:03 +00:00
Thomas Sjögren
7c29b65466 removing the warning about port 80.
svn:r3773
2005-03-18 16:34:56 +00:00
Thomas Sjögren
b1ceb1fb22 add "warning" about port 80 to torrc.sample.in
svn:r3772
2005-03-18 16:30:29 +00:00
Thomas Sjögren
932252f9b4 Show people where they can find the default exit policy.
svn:r3762
2005-03-14 23:26:41 +00:00
Roger Dingledine
d7cee9dbf4 make the example log-to-file line use log-level notice rather than
log-level warn.


svn:r3441
2005-01-28 05:40:41 +00:00
Roger Dingledine
8ebe85333c comment SocksPort better as it pertains to servers
svn:r3413
2005-01-22 06:51:31 +00:00
Roger Dingledine
f2a7ff6801 better comments for exit policies in torrc.sample
svn:r3371
2005-01-19 17:26:40 +00:00
Roger Dingledine
bd2d740b49 make it clearer why FooPort and FooBindAddress are separate
svn:r3369
2005-01-19 06:06:04 +00:00
Roger Dingledine
53c522ee1c make it clearer you can have multiple SocksBindAddress directives
svn:r3262
2005-01-03 21:47:59 +00:00
Roger Dingledine
fdf8c55f30 clarify the comments about logs in the torrc
svn:r3239
2005-01-02 06:34:58 +00:00
Roger Dingledine
0d7e8660c7 add a comment to explain what ContactInfo is for
svn:r3236
2005-01-01 23:58:16 +00:00
Roger Dingledine
ee282fc167 mark nickname and ORPort as the two required fields for servers
svn:r3156
2004-12-16 21:36:08 +00:00
Roger Dingledine
1477bf18e7 fix header text of torrc.sample
svn:r3129
2004-12-10 19:22:15 +00:00
Roger Dingledine
e0e40e51ae clean up docs a bit for default log lines.
svn:r3098
2004-12-07 06:38:41 +00:00
Roger Dingledine
40c97ac504 move the rendezous section of the torrc to the middle, since
it isn't server-only, and indeed it may be unwise to run a
hidden service on a server.


svn:r2995
2004-11-27 08:18:22 +00:00
Nick Mathewson
270b942edf Note where torrc goes.
svn:r2865
2004-11-14 19:08:08 +00:00
Peter Palfrader
a1e7ad4855 Fix two comments in torrc.sample.in directly in the upstream source
svn:r2812
2004-11-12 17:04:42 +00:00
Roger Dingledine
c106ab8315 clean torrc sample
change log files to end in .log for logrotate to notice
mention that address doesn't need to be defined


svn:r2803
2004-11-12 04:00:07 +00:00
Roger Dingledine
c41c469166 don't ship with the default dirservers listed explicitly. leave them
unlisted so we can change the default later.


svn:r2762
2004-11-10 00:14:02 +00:00
Roger Dingledine
6b22360eb8 fix mistake in comments
svn:r2723
2004-11-09 05:30:48 +00:00
Nick Mathewson
f490e5cdb6 Update log documentation
svn:r2691
2004-11-05 21:22:38 +00:00
Roger Dingledine
0c583a6cf2 clarify it even better
svn:r2687
2004-11-05 11:58:34 +00:00
Roger Dingledine
0ab8b8a4e4 resolve misleading torrc comments
svn:r2686
2004-11-05 11:55:35 +00:00
Nick Mathewson
831c988ea1 fix problems introduced by rpm spec patch.
svn:r2675
2004-11-04 15:34:04 +00:00
Nick Mathewson
69e5e8d0ad Merge RPM spec patch from jbash
svn:r2674
2004-11-04 15:17:22 +00:00
Nick Mathewson
26f3cb8652 Add SysLog option to direct log messages to the system log instead of a FILE*.
svn:r2591
2004-10-26 21:48:41 +00:00
Roger Dingledine
56e151eb41 advertise moria2's dirport as 18.244.0.114:80
svn:r2511
2004-10-14 10:05:22 +00:00
Roger Dingledine
892269bca3 reformat comment and fix typo
svn:r2485
2004-10-14 03:01:43 +00:00
Nick Mathewson
0d5a847f12 Remove need for dirservers file: now, we note trusted dirservers in configuration options, and only need to remember addr:port and key digest for each one.
svn:r2479
2004-10-14 01:44:32 +00:00
Roger Dingledine
c205ad05ba better example lines for dirbindaddress and orbindaddress
svn:r2415
2004-10-03 19:37:48 +00:00
Roger Dingledine
09f450104a don't imply to people that they should store their hidden service
keys in /tmp


svn:r2371
2004-09-23 20:50:27 +00:00
Roger Dingledine
eade496dcd JI hates people who say "IP" when they mean "IP address"
svn:r2352
2004-09-12 15:07:14 +00:00
Nick Mathewson
8ab26650ee Fix documentation about how not to be an OP
svn:r2342
2004-09-10 18:54:21 +00:00
Roger Dingledine
92a44fddb1 allow unverified nodes in middle and rendezvous positions by default
svn:r2258
2004-08-17 08:48:52 +00:00
Roger Dingledine
59a356ea47 clarify sockspolicy, exitpolicy rules
svn:r2157
2004-08-06 10:11:57 +00:00
Roger Dingledine
97338cf9a0 update the sample torrc
svn:r2139
2004-08-04 06:17:24 +00:00
Roger Dingledine
0536b853fd add a comment asking ORs to configure a DirPort too
svn:r2104
2004-07-22 11:16:39 +00:00
Roger Dingledine
0f69fd9954 add an example ContactInfo line to torrc.sample
svn:r1988
2004-06-29 19:32:11 +00:00
Roger Dingledine
73d3f3efa5 what is this "command line" that we can allegedly write to?
svn:r1967
2004-06-13 11:25:20 +00:00
Roger Dingledine
23c1a72c4c Address can be an IP too
svn:r1964
2004-06-10 14:23:34 +00:00
Roger Dingledine
26f77f4454 tweak on the sample torrc
svn:r1951
2004-06-06 18:00:59 +00:00
Nick Mathewson
dda75e8f09 Document new config options in torrc.sample.in
svn:r1944
2004-06-02 20:36:39 +00:00
Roger Dingledine
3532ba8177 a few instructions for hidden services
svn:r1914
2004-05-20 22:41:06 +00:00
Roger Dingledine
010ee5d0ba having two example exitpolicy lines, when only one is allowed, was confusing
svn:r1865
2004-05-13 22:38:16 +00:00
Roger Dingledine
f34b600764 forward-port dirservers file
svn:r1812
2004-05-06 22:46:42 +00:00
Roger Dingledine
dccbbaa88a give us a new dirservers file
svn:r1700
2004-04-25 21:56:52 +00:00
Peter Palfrader
a1a4c5be19 Update cvsignores
svn:r1577
2004-04-09 13:14:52 +00:00
Roger Dingledine
e32668ab13 clean up torrc.sample more
svn:r1543
2004-04-08 00:49:28 +00:00
Roger Dingledine
3dc3d0c4cc it's HiddenServiceDir
svn:r1457
2004-04-03 02:37:13 +00:00
Roger Dingledine
15036380a8 no underscores in nicknames
svn:r1454
2004-04-03 01:48:22 +00:00
Nick Mathewson
99dc566c18 Add examples for hidden services
svn:r1453
2004-04-03 01:44:24 +00:00
Roger Dingledine
ce200ae133 rename torrc to torrc.sample
now by default no torrc will be installed, so we'll just
use the built-in defaults (we already do this on windows)


svn:r1375
2004-03-30 00:01:03 +00:00
Roger Dingledine
694d287774 improve comments for server operators (maybe)
svn:r1241
2004-03-07 10:18:15 +00:00
Roger Dingledine
d1deb753db better explain exit policies in the torrc
svn:r1161
2004-02-28 11:44:07 +00:00
Roger Dingledine
67c0c64aa4 go back to a single exitpolicy parameter
if your exitpolicy includes " *:*" then it is final,
else we append the default exit policy.
(thanks weasel)


svn:r1105
2004-02-18 07:23:38 +00:00
Roger Dingledine
7562a62ef0 Get rid of the notion of a separate default default exit policy.
Create ExitPolicyPrepend config parameter, to customize the default
exit policy.


svn:r1103
2004-02-18 03:56:12 +00:00
Roger Dingledine
55d3ec028d reject 0.0.0.0/8,reject 169.254.0.0/16
svn:r916
2003-12-14 00:17:44 +00:00
Roger Dingledine
865173d7a1 put the default exit policy in place
svn:r900
2003-12-13 02:52:54 +00:00
Roger Dingledine
c183789c96 OnionRouter config option is obsolete
svn:r883
2003-12-03 20:21:03 +00:00
Roger Dingledine
fc98ca1a2d stop expecting sample-server-torrc to be there
svn:r873
2003-12-02 22:43:23 +00:00
Roger Dingledine
f53fe3cd7f merge torrc.in and sample-server-torrc.in
svn:r858
2003-11-20 18:22:09 +00:00
Roger Dingledine
aee3769cf3 remove obsolete config file
svn:r681
2003-10-27 10:09:09 +00:00
Roger Dingledine
c35fc271d2 move default exit policy into config files
svn:r654
2003-10-22 07:56:11 +00:00
Nick Mathewson
009f2f6dbb Update .cvsignores to exclude files generated due to recent build improvements
svn:r647
2003-10-21 17:49:52 +00:00
Roger Dingledine
0e137e413f APPort is now SocksPort
svn:r644
2003-10-21 09:49:39 +00:00
Roger Dingledine
80d428b225 remove obsolete config file
svn:r641
2003-10-21 09:22:38 +00:00
Roger Dingledine
db33eac4c4 add an Address line to the sample server rc file
svn:r633
2003-10-19 05:50:52 +00:00
Roger Dingledine
4f1a84b772 and in OP config files
svn:r589
2003-10-15 07:27:29 +00:00
Roger Dingledine
b24b846069 less confusing comments in config files
svn:r588
2003-10-15 07:26:39 +00:00
Steven Hazel
a54a65dfb6 - cause configure to create a tor.sh which will have directories set
correctly based on how configure was run

- cause tor to guess the location of torrc more intelligently

- cause cause src/config/torrc and src/conf/sample-server-torrc to be
  generated with contents that are correct for the way configure was
  run

- cause "make install" to put torrc, sample-server-torrc, and
  dirservers somewhere intelligent


svn:r587
2003-10-15 07:19:38 +00:00
Roger Dingledine
f5cb7887d9 clean up the sample or rc
svn:r585
2003-10-14 03:21:39 +00:00
Roger Dingledine
4039eccd6f and a Makefile.am for src/config/
svn:r545
2003-10-07 16:30:38 +00:00
Roger Dingledine
01884951bc updated dirservers file, new config files.
svn:r524
2003-09-30 23:25:30 +00:00
Roger Dingledine
3b5191d36d various bugfixes and updates
redo all the config files for the new format (we'll redo them again soon)

fix (another! yuck) segfault in log_fn when input is too large
tor_tls_context_new() returns -1 for error, not NULL
fix segfault in check_conn_marked() on conn's that die during tls handshake

make ORs also initialize conn from router when we're the receiving node

make non-dirserver ORs upload descriptor to every dirserver on startup
add our local address to the descriptor
add Content-Length field to POST command
revert the Content-Length search in fetch_from_buf_http() to previous code
fix segfault in memmove in fetch_from_buf_http()
raise maximum allowed headers/body size in directory.c


svn:r484
2003-09-25 10:42:07 +00:00
Roger Dingledine
ec23ebc4e6 update onion router configs for tls
svn:r446
2003-09-11 22:20:16 +00:00
Roger Dingledine
7ae853b04c router formats don't include op_port now either
svn:r419
2003-08-27 22:42:39 +00:00
Roger Dingledine
8e242d9b87 update config files to not use opport
svn:r300
2003-05-28 06:22:18 +00:00
Nick Mathewson
22df330f14 Get directories working.
Or at least, directories get generated, signed, download, and checked, with
nobody seeming to crash.

In config/*, added 'signing-key' blocks to dirservers and routers.or, so
that everyone will know about the directories' signing keys.

In or/directory.c, refrained from using a dirserver's signing key when
no such key is known; added more debugging output.

In or/main.c, added debugging output and fixed a few logic errors.

In or/routers.c, added debugging output and prevented a segfault on
routers_resolve_directory.  The interleaving of arrays and lists on
routerinfo_t is still messy, but at least it seems to work again.


svn:r278
2003-05-08 21:35:11 +00:00
Roger Dingledine
bcfbccb056 cheap hack so the dirservers have a signing key
svn:r275
2003-05-07 22:41:12 +00:00
Nick Mathewson
fcf7bfe290 Refactor directories; add unit tests; add router keyword
svn:r266
2003-05-06 17:38:16 +00:00
Roger Dingledine
e03af74d55 obsolete notion of 'role' from config files
svn:r210
2003-03-19 22:40:58 +00:00
Roger Dingledine
d9770fbd96 clean up and slightly document the config files
svn:r179
2003-03-16 04:40:16 +00:00
Roger Dingledine
7461959371 let up on the bandwidth constraints
svn:r162
2003-02-18 01:55:51 +00:00
Roger Dingledine
584a4fc4dd Allow more connections open at once
svn:r160
2003-02-18 01:35:31 +00:00
Roger Dingledine
366908f8df commit my current tor rc versions
svn:r156
2003-02-14 04:10:13 +00:00
Roger Dingledine
00a9e3732e remove popt dependency, consolidate config stuff
reformat parts of onion.c


svn:r136
2002-11-23 06:49:01 +00:00
Roger Dingledine
e0f77fc36b adding town-square rc info
svn:r122
2002-09-28 05:52:47 +00:00
Roger Dingledine
22285e6ff1 cleanup
prkey is only fetched when it's needed
tor nodes who aren't dirservers now fetch directories and autoconnect
  to new nodes listed in the directory
default role is a non-dirserver node


svn:r120
2002-09-28 00:52:59 +00:00
Roger Dingledine
5811b22bee new config files, including directory servers
svn:r115
2002-09-26 23:53:21 +00:00
Roger Dingledine
253f0f160e laying the groundwork for dynamic router lists
revamped the router reading section

reference counting for crypto pk env's (so we can dup them)

we now read and write pem pk keys from string rather than from FILE*,
  in anticipation of fetching directories over a socket
  (so now on startup we slurp in the whole file, then parse it as a string)

fixed a bug in the proxy side, where you could get some circuits
  wedged if they showed up while the connection was being made


svn:r110
2002-09-24 10:43:57 +00:00
Roger Dingledine
5449fc86db synchronize to the version i've been giving people to test
svn:r104
2002-09-19 20:13:27 +00:00
Roger Dingledine
958ec8d4fb port to actual BSD
(hey nick, does this break the os x build?)

you still need to add some stuff to the ./configure commandline...
anybody know a better solution?


svn:r101
2002-09-09 04:10:58 +00:00
Roger Dingledine
9287ad82a8 an rc file for an onion proxy
svn:r97
2002-09-04 06:46:09 +00:00
Roger Dingledine
a303325dca More reasonable CoinWeight, now that we can handle large paths
svn:r70
2002-07-22 04:08:15 +00:00
Roger Dingledine
fee55dd4a3 minor cleanups in config files
svn:r62
2002-07-19 18:48:03 +00:00
Roger Dingledine
ab2218bb46 moria:9004 is now a twin to town-square:9004
svn:r57
2002-07-19 00:33:31 +00:00
Andrei Serjantov
53cec4caef Put in a note in README to explain how to compile (I had to wade
through the cvs messages), and added my router on mosg.cl.cam.ac.uk to
the list of routers.


svn:r52
2002-07-16 16:18:16 +00:00
Roger Dingledine
c951c6f186 new config files, some bugfixes
svn:r51
2002-07-16 02:12:58 +00:00
Roger Dingledine
9526211137 Committing my working config files, so we'll all be on the same page
Note that there are new keywords in these, etc. Matej, would you be
interested in going through and patching routers.c, config.c, etc, so
they're cleaner?


svn:r19
2002-07-02 09:14:18 +00:00