move default exit policy into config files

svn:r654

diff --git a/src/config/moria1-orrc b/src/config/moria1-orrc
index 8ba5ad45a41f9defee0baa6c58a735a22ce0c2b8..3e9ed009566f7ce87fc95ad93eb297fa5b8df240 100644 (file)
--- a/src/config/moria1-orrc
+++ b/src/config/moria1-orrc
@@ -10,3 +10,5 @@ OnionRouter 1
 # List of routers
 RouterFile ../config/dirservers
 
+ExitPolicy reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*
+

diff --git a/src/config/moria2-orrc b/src/config/moria2-orrc
index aa956c0a122f0e89fe8b6e11f2cceed0787399c3..cec77d67d1e4a813a27e010a48081c75fdd82c59 100644 (file)
--- a/src/config/moria2-orrc
+++ b/src/config/moria2-orrc
@@ -10,3 +10,5 @@ OnionRouter 1
 # List of routers
 RouterFile ../config/dirservers
 
+ExitPolicy reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*
+

diff --git a/src/config/moria3-orrc b/src/config/moria3-orrc
index 3610cd28a5cb06ac400d52c835db42ef3145e415..1b23f0c8df92462387a21c4cd509cc73fbc14fb8 100644 (file)
--- a/src/config/moria3-orrc
+++ b/src/config/moria3-orrc
@@ -10,3 +10,5 @@ OnionRouter 1
 # List of routers
 RouterFile ../config/dirservers
 
+ExitPolicy reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*
+

diff --git a/src/config/sample-server-torrc.in b/src/config/sample-server-torrc.in
index 59a88460a1fa9d7c15e5e1db2b563017c965582f..eef8c5573c25bc4ed60c5a032a2bbf09372b378d 100644 (file)
--- a/src/config/sample-server-torrc.in
+++ b/src/config/sample-server-torrc.in
@@ -3,20 +3,24 @@
 # The directory for keeping all the config/data for this node
 DataDirectory @LOCALSTATEDIR@/lib/tor
 # A unique handle for this node
-Nickname moria4
+Nickname moria
 # The fqdn for this node
 Address moria.seul.org
 
 # Ports for various services. Comment out or set to 0 if you're not
 # offering that service.
-ORPort 9004 # listening for cell-speaking connections
-SocksPort 9024 # listening for socks-speaking connections
+ORPort 9001 # listening for cell-speaking connections
+SocksPort 9050 # listening for socks-speaking connections
 #DirPort 0
 
-# Leave this set, or we'll be treated like a client.
-OnionRouter 1
-
 # List of routers. Tor nodes start out knowing about the directory
 # servers, and from them they get a list of currently up nodes.
 RouterFile @CONFDIR@/dirservers
 
+# A comma-separated list of exit policies. They're considered in
+# order, first match wins.
+ExitPolicy reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*
+
+# Leave this set, or we'll be treated like a client.
+OnionRouter 1
+