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

1 files changed, 43 insertions, 40 deletions

diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 86e347074e..fa5e6a7fd3 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,73 +1,76 @@
-# Configuration file for a typical tor user
+## Configuration file for a typical tor user
 
-# Replace this with "SocksPort 0" if you don't want clients to connect.
+## Replace this with "SocksPort 0" if you don't want clients to connect.
 SocksPort 9050 # what port to advertise for application connections
 SocksBindAddress 127.0.0.1 # accept connections only from localhost
 #SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port
 
-# Entry policies to allow/deny SOCKS requests based on IP address.
-# First entry that matches wins. If no SocksPolicy is set, we accept
-# all (and only) requests from SocksBindAddress.
-#
+## Entry policies to allow/deny SOCKS requests based on IP address.
+## First entry that matches wins. If no SocksPolicy is set, we accept
+## all (and only) requests from SocksBindAddress.
 #SocksPolicy accept 192.168.0.1/16
 #SocksPolicy reject *
 
-# Allow no-name routers (ones that the dirserver operators don't
-# know anything about) in only these positions in your circuits.
-# Other choices (not advised) are entry,exit,introduction.
+## Allow no-name routers (ones that the dirserver operators don't
+## know anything about) in only these positions in your circuits.
+## Other choices (not advised) are entry,exit,introduction.
 AllowUnverifiedNodes middle,rendezvous
 
-# Logs go to stdout unless redirected by something else, like one of
-# the below lines, or --logfile on the command line.
-### Send all messages of level 'warn' or higher to @LOCALSTATEDIR@/log/tor/warnings
-#Log warn file @LOCALSTATEDIR@/log/tor/warnings
-### Send all debug and info messages to @LOCALSTATEDIR@/log/tor/debug
-#Log debug-info file @LOCALSTATEDIR@/log/tor/debug
-### Send all debug messages ONLY to @LOCALSTATEDIR@/log/tor/debug
-#Log debug-debug file @LOCALSTATEDIR@/log/tor/debug
-### To use the system log instead of Tor's logfiles, uncomment these lines:
+## Logs go to stdout unless redirected by something else, like one of
+## the below lines.
+## Send all messages of level 'warn' or higher to @LOCALSTATEDIR@/log/tor/warnings
+#Log warn file @LOCALSTATEDIR@/log/tor/warnings.log
+## Send all debug and info messages to @LOCALSTATEDIR@/log/tor/debug
+#Log debug-info file @LOCALSTATEDIR@/log/tor/debug.log
+## Send all debug messages ONLY to @LOCALSTATEDIR@/log/tor/debug
+#Log debug-debug file @LOCALSTATEDIR@/log/tor/debug.log
+## To use the system log instead of Tor's logfiles, uncomment these lines:
 #Log notice syslog
-### To send all messages to stderr:
+## To send all messages to stderr:
 #Log debug-err stderr
 
-# Uncomment this to start the process in the background... or use
-# --runasdaemon 1 on the command line.
+## Uncomment this to start the process in the background... or use
+## --runasdaemon 1 on the command line.
 #RunAsDaemon 1
 
-# Tor only trusts directories signed with one of these keys, and
-# uses the given addresses to connect to the trusted directory
-# servers. If no DirServer lines are specified, Tor uses the built-in
-# defaults (moria1, moria2, tor26), so you can leave this alone unless
-# you need to change it.
+## Tor only trusts directories signed with one of these keys, and
+## uses the given addresses to connect to the trusted directory
+## servers. If no DirServer lines are specified, Tor uses the built-in
+## defaults (moria1, moria2, tor26), so you can leave this alone unless
+## you need to change it.
 #DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
 #DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
 #DirServer 62.116.124.106:9030 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
 
-# The directory for keeping all the keys/etc. By default, we store
-# things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
+## The directory for keeping all the keys/etc. By default, we store
+## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
 #DataDirectory @LOCALSTATEDIR@/lib/tor
 
 ##################### Below is just for servers #####################
 
-## NOTE: If you enable these, you should consider mailing your
-## identity key fingerprint to the tor-ops, so we can verify
-## your configuration. See the README for details.
+## NOTE: If you enable these, you should consider mailing your identity
+## key fingerprint to the tor-ops, so we can add you to the list of
+## servers that clients will trust. See the README for details.
+
+## A unique handle for this server
+#Nickname ididnteditheconfig
+
+## The IP or fqdn for this server. Leave blank and Tor will guess.
+#Address noname.example.com
 
-#Nickname ididnteditheconfig       # A unique handle for this server
-#Address noname.example.com        # The IP or fqdn for this server
 #ContactInfo 1234D/FFFFFFFF Random Person <nobody@example.com>
 
 #ORPort 9001 # what port to advertise for tor connections
-# If you want to listen on a port other than the one advertised
-# in ORPort, uncomment the line below. You'll need to do ipchains
-# or other port forwarding yourself to make this work.
+## If you want to listen on a port other than the one advertised
+## in ORPort, uncomment the line below. You'll need to do ipchains
+## or other port forwarding yourself to make this work.
 #ORBindAddress 0.0.0.0:9090
 
-# Uncomment this to mirror the directory for others (please do)
+## Uncomment this to mirror the directory for others (please do)
 #DirPort 9030 # what port to advertise for directory connections
-# If you want to listen on a port other than the one advertised
-# in DirPort, uncomment the line below. You'll need to do ipchains
-# or other port forwarding yourself to make this work.
+## If you want to listen on a port other than the one advertised
+## in DirPort, uncomment the line below. You'll need to do ipchains
+## or other port forwarding yourself to make this work.
 #DirBindAddress 0.0.0.0:9091
 
 ## A comma-separated list of exit policies. They're considered first