From d11dc6068d93d2c44c9f6ae12949d666b5e9a564 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sun, 24 Jul 2005 17:15:07 +0000
Subject: [PATCH] add a stripped down and cleaned up default configuration

---
 tor/rc.tor   | 14 ++++++--------
 tor/tor.spec |  3 +++
 tor/torrc    | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 tor/torrc

diff --git a/tor/rc.tor b/tor/rc.tor
index 349fa2067a..5f44578ee3 100644
--- a/tor/rc.tor
+++ b/tor/rc.tor
@@ -12,10 +12,8 @@
     tor_log_complevel="9"
 
 %common
-    tor_cfgfile="@l_prefix@/etc/tor/torrc"
     tor_logfile="@l_prefix@/var/tor/tor.log"
     tor_pidfile="@l_prefix@/var/tor/tor.pid"
-    tor_datadir="@l_prefix@/var/tor/db"
     tor_signal () {
         [ -f $tor_pidfile ] && kill -$1 `cat $tor_pidfile`
     }
@@ -32,12 +30,7 @@
 %start -u @l_rusr@
     rcService tor enable yes || exit 0
     rcService tor active yes && exit 0
-    @l_prefix@/bin/tor \
-        -f $tor_cfgfile \
-        --datadirectory $tor_datadir \
-        --log "notice file $tor_logfile" \
-        --pidfile $tor_pidfile \
-        --runasdaemon 1
+    @l_prefix@/bin/tor
 
 %stop -u @l_rusr@
     rcService tor enable yes || exit 0
@@ -51,6 +44,11 @@
     rcService tor active no  && exit 0
     rc tor stop start
 
+%reload -u @l_rusr@
+    rcService tor enable yes || exit 0
+    rcService tor active no  && exit 0
+    tor_signal HUP
+
 %daily -u @l_susr@
     rcService tor enable yes || exit 0
     shtool rotate -f \
diff --git a/tor/tor.spec b/tor/tor.spec
index a7e51bd21d..69cfde3dde 100644
--- a/tor/tor.spec
+++ b/tor/tor.spec
@@ -38,6 +38,7 @@ Release:      20050724
 #   list of sources
 Source0:      http://tor.eff.org/dist/tor-%{version}.tar.gz
 Source1:      rc.tor
+Source2:      torrc
 
 #   build information
 Prefix:       %{l_prefix}
@@ -96,6 +97,8 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.tor} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+        %{SOURCE torrc} $RPM_BUILD_ROOT%{l_prefix}/etc/tor/
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/tor/db
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
diff --git a/tor/torrc b/tor/torrc
new file mode 100644
index 0000000000..1f9bb4b4a1
--- /dev/null
+++ b/tor/torrc
@@ -0,0 +1,41 @@
+##
+##  torrc -- Tor Daemon Configuration
+##
+
+#   ==== CLIENT CONFIGURATION ====
+
+User                 @l_rusr@
+Group                @l_rgrp@
+RunAsDaemon          1
+DataDirectory        @l_prefix@/var/tor/db
+PIDFile              @l_prefix@/var/tor/tor.pid
+Log                  notice file @l_prefix@/var/tor/tor.log
+
+SocksPort            9050
+SocksBindAddress     127.0.0.1
+SocksPolicy          accept 127.0.0.1/8
+SocksPolicy          reject *
+OutboundBindAddress  0.0.0.0
+
+AllowUnverifiedNodes middle,rendezvous
+#DirServer           18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
+#DirServer           18.244.0.114:80   719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
+#DirServer           86.59.5.130:80    847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
+
+#   ==== SERVER CONFIGURATION ====
+
+#HiddenServiceDir    @l_prefix@/var/tor/db/service/
+#HiddenServicePort   80 127.0.0.1:80
+#HiddenServicePort   22 127.0.0.1:22
+
+#Nickname            ExampleTOR
+#Address             tor.example.com
+#ContactInfo         TOR Administrator <tor@example.com>
+#ORPort              9001
+#ORBindAddress       0.0.0.0:9001
+#DirPort             9030
+#DirBindAddress      0.0.0.0:9030
+#ExitPolicy          accept *:6660-6667,reject *:*
+#ExitPolicy          accept *:119
+#ExitPolicy          reject *:*
+