diff options
-rw-r--r-- | src/config/sample-server-torrc.in | 26 | ||||
-rw-r--r-- | src/config/torrc.in | 23 |
2 files changed, 18 insertions, 31 deletions
diff --git a/src/config/sample-server-torrc.in b/src/config/sample-server-torrc.in deleted file mode 100644 index eef8c5573..000000000 --- a/src/config/sample-server-torrc.in +++ /dev/null @@ -1,26 +0,0 @@ -# Configuration file for a typical tor node - -# The directory for keeping all the config/data for this node -DataDirectory @LOCALSTATEDIR@/lib/tor -# A unique handle for this node -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 9001 # listening for cell-speaking connections -SocksPort 9050 # listening for socks-speaking connections -#DirPort 0 - -# 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 - diff --git a/src/config/torrc.in b/src/config/torrc.in index 1208a3624..f3b63efa0 100644 --- a/src/config/torrc.in +++ b/src/config/torrc.in @@ -1,12 +1,25 @@ -# Configuration file for a typical tor client -# (listen for applications only) +# Configuration file for a typical tor user # 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 -# Ports for various services. Comment out if you're not running that -# service. -#ORPort 9001 +# Comment out if you don't want to allow applications to connect. SocksPort 9050 +SocksBindAddress 127.0.0.1 # accept connections only from localhost + +##################### Below is just for servers ##################### + +## The directory for keeping all the keys/etc for this server +#DataDirectory @LOCALSTATEDIR@/lib/tor + +#Nickname moria # A unique handle for this server +#Address moria.seul.org # The fqdn for this server + +#ORPort 9001 # where to listen for cell-speaking connections +#ORBindAddress 0.0.0.0 # accept connections from anywhere + +## A comma-separated list of exit policies. They're considered in +## order, first match wins. +#ExitPolicy reject 127.0.0.1:*,accept *:* |