aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-27 08:18:22 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-27 08:18:22 +0000
commit40c97ac5044206bb224630d989537307f04d336b (patch)
tree9a6c0bc41b640a6dc770a33754881b4fb357773e /src
parent7c81603f3ab4c89a130557cd94852ba2193e9c74 (diff)
downloadtor-40c97ac5044206bb224630d989537307f04d336b.tar
tor-40c97ac5044206bb224630d989537307f04d336b.tar.gz
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
Diffstat (limited to 'src')
-rw-r--r--src/config/torrc.sample.in32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index f039318f4..235ee75dc 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -52,7 +52,22 @@ AllowUnverifiedNodes middle,rendezvous
## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
#DataDirectory @LOCALSTATEDIR@/lib/tor
-##################### Below is just for servers #####################
+############### This section is just for location-hidden services ###
+
+## Look in .../hidden_service/hostname for the address to tell people.
+## HiddenServicePort x y:z says to redirect a port x request from the
+## client to y:z.
+
+#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/
+#HiddenServicePort 80 127.0.0.1:80
+
+#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/
+#HiddenServicePort 80 127.0.0.1:80
+#HiddenServicePort 22 127.0.0.1:22
+#HiddenServiceNodes moria1,moria2
+#HiddenServiceExcludeNodes bad,otherbad
+
+################ This section is just for servers #####################
## 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
@@ -88,18 +103,3 @@ AllowUnverifiedNodes middle,rendezvous
#ExitPolicy reject 192.168.0.1:*
#ExitPolicy reject *:*
-##################### Below is just for location-hidden services ###
-
-## Look in .../hidden_service/hostname for the url to tell people.
-## HiddenServicePort x y:z says to redirect a port x request from the
-## client to y:z.
-
-#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-
-#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-#HiddenServicePort 22 127.0.0.1:22
-#HiddenServiceNodes moria1,moria2
-#HiddenServiceExcludeNodes bad,otherbad
-