OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jul-2005 19:15:07
Branch: HEAD Handle: 2005072418150700
Added files:
openpkg-src/tor torrc
Modified files:
openpkg-src/tor rc.tor tor.spec
Log:
add a stripped down and cleaned up default configuration
Summary:
Revision Changes Path
1.2 +6 -8 openpkg-src/tor/rc.tor
1.2 +3 -0 openpkg-src/tor/tor.spec
1.1 +41 -0 openpkg-src/tor/torrc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tor/rc.tor
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.tor
--- openpkg-src/tor/rc.tor 24 Jul 2005 09:10:00 -0000 1.1
+++ openpkg-src/tor/rc.tor 24 Jul 2005 17:15:07 -0000 1.2
@@ -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 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tor/tor.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 tor.spec
--- openpkg-src/tor/tor.spec 24 Jul 2005 09:10:00 -0000 1.1
+++ openpkg-src/tor/tor.spec 24 Jul 2005 17:15:07 -0000 1.2
@@ -38,6 +38,7 @@
# 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 @@
$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 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tor/torrc
============================================================================
$ cvs diff -u -r0 -r1.1 torrc
--- /dev/null 2005-07-24 19:15:06 +0200
+++ torrc 2005-07-24 19:15:07 +0200
@@ -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 <[EMAIL PROTECTED]>
+#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 *:*
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
