Sat, 25 Jan 2014 18:21:16 +0100
Improve runtime configuration including additional network definition.
tor/rc.tor | file | annotate | diff | comparison | revisions | |
tor/torrc | file | annotate | diff | comparison | revisions |
1.1 --- a/tor/rc.tor Fri Jan 24 17:02:56 2014 +0100 1.2 +++ b/tor/rc.tor Sat Jan 25 18:21:16 2014 +0100 1.3 @@ -18,7 +18,7 @@ 1.4 [ -f $tor_pidfile ] && kill -$1 `cat $tor_pidfile` 1.5 } 1.6 1.7 -%status -u @l_rusr@ -o 1.8 +%status -u @l_susr@ -o 1.9 tor_usable="unknown" 1.10 tor_active="no" 1.11 rcService tor enable yes && \ 1.12 @@ -27,24 +27,24 @@ 1.13 echo "tor_usable=\"$tor_usable\"" 1.14 echo "tor_active=\"$tor_active\"" 1.15 1.16 -%start -u @l_rusr@ 1.17 +%start -u @l_susr@ 1.18 rcService tor enable yes || exit 0 1.19 rcService tor active yes && exit 0 1.20 @l_prefix@/bin/tor 1.21 1.22 -%stop -u @l_rusr@ 1.23 +%stop -u @l_susr@ 1.24 rcService tor enable yes || exit 0 1.25 rcService tor active no && exit 0 1.26 tor_signal TERM 1.27 sleep 2 1.28 rm -f $tor_pidfile >/dev/null 2>&1 || true 1.29 1.30 -%restart -u @l_rusr@ 1.31 +%restart -u @l_susr@ 1.32 rcService tor enable yes || exit 0 1.33 rcService tor active no && exit 0 1.34 rc tor stop start 1.35 1.36 -%reload -u @l_rusr@ 1.37 +%reload -u @l_susr@ 1.38 rcService tor enable yes || exit 0 1.39 rcService tor active no && exit 0 1.40 tor_signal HUP 1.41 @@ -53,7 +53,7 @@ 1.42 rcService tor enable yes || exit 0 1.43 shtool rotate -f \ 1.44 -n ${tor_log_numfiles} -s ${tor_log_minsize} -d \ 1.45 - -z ${tor_log_complevel} -m 664 -o @l_rusr@ -g @l_rgrp@ \ 1.46 + -z ${tor_log_complevel} -m 664 -o @l_susr@ -g @l_rgrp@ \ 1.47 -P "${tor_log_prolog}" \ 1.48 -E "${tor_log_epilog}; rc tor restart" \ 1.49 ${tor_logfile}
2.1 --- a/tor/torrc Fri Jan 24 17:02:56 2014 +0100 2.2 +++ b/tor/torrc Sat Jan 25 18:21:16 2014 +0100 2.3 @@ -5,11 +5,13 @@ 2.4 # ==== CLIENT CONFIGURATION ==== 2.5 2.6 RunAsDaemon 1 2.7 +User @l_rusr@ 2.8 DataDirectory @l_prefix@/var/tor/db 2.9 PIDFile @l_prefix@/var/tor/tor.pid 2.10 Log notice file @l_prefix@/var/tor/tor.log 2.11 2.12 -SocksPort 9050 2.13 +#SocksPort 9050 2.14 +SocksPort 0 2.15 SocksBindAddress 127.0.0.1 2.16 SocksPolicy accept 127.0.0.1/8 2.17 SocksPolicy reject * 2.18 @@ -26,13 +28,18 @@ 2.19 #HiddenServicePort 80 127.0.0.1:80 2.20 #HiddenServicePort 22 127.0.0.1:22 2.21 2.22 +#BridgeRelay 1 2.23 +#PublishServerDescriptor 0 2.24 #Nickname ExampleTOR 2.25 #Address tor.example.com 2.26 #ContactInfo TOR Administrator <tor@example.com> 2.27 #ORPort 9001 2.28 #ORBindAddress 0.0.0.0:9001 2.29 -#DirPort 9030 2.30 +#DirPort 9030 # Make this 80 if you want to serve HTML blurb 2.31 #DirBindAddress 0.0.0.0:9030 2.32 +#DirPortFrontPage @l_prefix@/etc/tor/notice.html 2.33 +#RelayBandwidthRate 100 KB # Throttle to 100KB/s (800Kbps) 2.34 +#RelayBandwidthBurst 200 KB 2.35 #ExitPolicy accept *:6660-6667,reject *:* 2.36 #ExitPolicy accept *:119 2.37 #ExitPolicy reject *:*