Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/tor/files: torrc-r1 torrc.sample.patch tor.initd-r5
Date: Tue, 30 Aug 2011 13:57:53
Message-Id: 20110830135742.763362004C@flycatcher.gentoo.org
1 blueness 11/08/30 13:57:42
2
3 Added: torrc-r1 torrc.sample.patch tor.initd-r5
4 Log:
5 Change logging to syslog, add sanity check for /var/run/tor, bug #380117
6
7 (Portage version: 2.1.10.11/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-misc/tor/files/torrc-r1
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/torrc-r1?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/torrc-r1?rev=1.1&content-type=text/plain
14
15 Index: torrc-r1
16 ===================================================================
17 #
18 # Minimal torrc so tor will work out of the box
19 #
20 User tor
21 PIDFile /var/run/tor/tor.pid
22 Log notice syslog
23 DataDirectory /var/lib/tor/data
24
25
26
27 1.1 net-misc/tor/files/torrc.sample.patch
28
29 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/torrc.sample.patch?rev=1.1&view=markup
30 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/torrc.sample.patch?rev=1.1&content-type=text/plain
31
32 Index: torrc.sample.patch
33 ===================================================================
34 diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
35 --- tor-0.2.2.32.orig/src/config/torrc.sample.in 2011-08-29 23:13:09.000000000 -0400
36 +++ tor-0.2.2.32/src/config/torrc.sample.in 2011-08-29 23:14:19.000000000 -0400
37 @@ -12,6 +12,10 @@
38 ## Tor will look for this file in various places based on your platform:
39 ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc
40
41 +## Default username and group the server will run as
42 +User tor
43 +
44 +PIDFile /var/run/tor/tor.pid
45
46 ## Replace this with "SocksPort 0" if you plan to run Tor only as a
47 ## relay, and not make any local application connections yourself.
48 @@ -40,6 +44,7 @@
49 #Log notice syslog
50 ## To send all messages to stderr:
51 #Log debug stderr
52 +Log notice syslog
53
54 ## Uncomment this to start the process in the background... or use
55 ## --runasdaemon 1 on the command line. This is ignored on Windows;
56 @@ -49,6 +54,7 @@
57 ## The directory for keeping all the keys/etc. By default, we store
58 ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
59 #DataDirectory @LOCALSTATEDIR@/lib/tor
60 +DataDirectory /var/lib/tor/data
61
62 ## The port on which Tor will listen for local connections from Tor
63 ## controller applications, as documented in control-spec.txt.
64
65
66
67 1.3 net-misc/tor/files/tor.initd-r5
68
69 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/tor.initd-r5?rev=1.3&view=markup
70 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/tor.initd-r5?rev=1.3&content-type=text/plain
71 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tor/files/tor.initd-r5?r1=1.2&r2=1.3