# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1390670476 -3600
# Node ID a5b2210360f9ea188d6d7e806693556fbc094c62
# Parent  ab976cd2e548dfb2cd08ced0237ba86223ed02b2
Improve runtime configuration including additional network definition.

diff -r ab976cd2e548 -r a5b2210360f9 tor/rc.tor
--- a/tor/rc.tor	Fri Jan 24 17:02:56 2014 +0100
+++ b/tor/rc.tor	Sat Jan 25 18:21:16 2014 +0100
@@ -18,7 +18,7 @@
         [ -f $tor_pidfile ] && kill -$1 `cat $tor_pidfile`
     }
 
-%status -u @l_rusr@ -o
+%status -u @l_susr@ -o
     tor_usable="unknown"
     tor_active="no"
     rcService tor enable yes && \
@@ -27,24 +27,24 @@
     echo "tor_usable=\"$tor_usable\""
     echo "tor_active=\"$tor_active\""
 
-%start -u @l_rusr@
+%start -u @l_susr@
     rcService tor enable yes || exit 0
     rcService tor active yes && exit 0
     @l_prefix@/bin/tor
 
-%stop -u @l_rusr@
+%stop -u @l_susr@
     rcService tor enable yes || exit 0
     rcService tor active no  && exit 0
     tor_signal TERM
     sleep 2
     rm -f $tor_pidfile >/dev/null 2>&1 || true
 
-%restart -u @l_rusr@
+%restart -u @l_susr@
     rcService tor enable yes || exit 0
     rcService tor active no  && exit 0
     rc tor stop start
 
-%reload -u @l_rusr@
+%reload -u @l_susr@
     rcService tor enable yes || exit 0
     rcService tor active no  && exit 0
     tor_signal HUP
@@ -53,7 +53,7 @@
     rcService tor enable yes || exit 0
     shtool rotate -f \
         -n ${tor_log_numfiles} -s ${tor_log_minsize} -d \
-        -z ${tor_log_complevel} -m 664 -o @l_rusr@ -g @l_rgrp@ \
+        -z ${tor_log_complevel} -m 664 -o @l_susr@ -g @l_rgrp@ \
         -P "${tor_log_prolog}" \
         -E "${tor_log_epilog}; rc tor restart" \
         ${tor_logfile}
diff -r ab976cd2e548 -r a5b2210360f9 tor/torrc
--- a/tor/torrc	Fri Jan 24 17:02:56 2014 +0100
+++ b/tor/torrc	Sat Jan 25 18:21:16 2014 +0100
@@ -5,11 +5,13 @@
 #   ==== CLIENT CONFIGURATION ====
 
 RunAsDaemon          1
+User                 @l_rusr@
 DataDirectory        @l_prefix@/var/tor/db
 PIDFile              @l_prefix@/var/tor/tor.pid
 Log                  notice file @l_prefix@/var/tor/tor.log
 
-SocksPort            9050
+#SocksPort            9050
+SocksPort            0
 SocksBindAddress     127.0.0.1
 SocksPolicy          accept 127.0.0.1/8
 SocksPolicy          reject *
@@ -26,13 +28,18 @@
 #HiddenServicePort   80 127.0.0.1:80
 #HiddenServicePort   22 127.0.0.1:22
 
+#BridgeRelay         1
+#PublishServerDescriptor 0
 #Nickname            ExampleTOR
 #Address             tor.example.com
 #ContactInfo         TOR Administrator <tor@example.com>
 #ORPort              9001
 #ORBindAddress       0.0.0.0:9001
-#DirPort             9030
+#DirPort             9030  # Make this 80 if you want to serve HTML blurb
 #DirBindAddress      0.0.0.0:9030
+#DirPortFrontPage    @l_prefix@/etc/tor/notice.html
+#RelayBandwidthRate  100 KB  # Throttle to 100KB/s (800Kbps)
+#RelayBandwidthBurst 200 KB
 #ExitPolicy          accept *:6660-6667,reject *:*
 #ExitPolicy          accept *:119
 #ExitPolicy          reject *:*