- Resurrect mistakenly removed needed patch file

Blaming:	mess on submitter's box
This commit is contained in:
Pav Lucistnik 2005-05-24 16:39:42 +00:00
parent 7b0283fa35
commit fb442c58d0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136046
2 changed files with 58 additions and 0 deletions

View File

@ -0,0 +1,29 @@
--- contrib/tor.sh.in.orig Sat Jan 29 20:41:19 2005
+++ contrib/tor.sh.in Sat Jan 29 20:46:14 2005
@@ -5,12 +5,12 @@
# chkconfig: 2345 90 10
# description: Onion Router
-TORUSER=
-TORGROUP=
+TORUSER=_tor
+TORGROUP=_tor
TORBIN=@BINDIR@/tor
-TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
-TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
-TORDATA=@LOCALSTATEDIR@/lib/tor
+TORPID=/var/run/tor.pid
+TORLOG=/var/log/tor.log
+TORDATA=/var/db/tor/data
TORCONF=@CONFDIR@/torrc
# Strictly speaking, we don't need to su if we have --user and --group.
@@ -36,7 +36,7 @@
if [ "x$TORUSER" = "x" ]; then
$TORBIN -f $TORCONF $TORARGS
else
- /bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER
+ /usr/bin/su $TORUSER -c "$TORBIN -f $TORCONF $TORARGS"
fi
RETVAL=$?
if [ $RETVAL -eq 0 ]; then

View File

@ -0,0 +1,29 @@
--- contrib/tor.sh.in.orig Sat Jan 29 20:41:19 2005
+++ contrib/tor.sh.in Sat Jan 29 20:46:14 2005
@@ -5,12 +5,12 @@
# chkconfig: 2345 90 10
# description: Onion Router
-TORUSER=
-TORGROUP=
+TORUSER=_tor
+TORGROUP=_tor
TORBIN=@BINDIR@/tor
-TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
-TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
-TORDATA=@LOCALSTATEDIR@/lib/tor
+TORPID=/var/run/tor.pid
+TORLOG=/var/log/tor.log
+TORDATA=/var/db/tor/data
TORCONF=@CONFDIR@/torrc
# Strictly speaking, we don't need to su if we have --user and --group.
@@ -36,7 +36,7 @@
if [ "x$TORUSER" = "x" ]; then
$TORBIN -f $TORCONF $TORARGS
else
- /bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER
+ /usr/bin/su $TORUSER -c "$TORBIN -f $TORCONF $TORARGS"
fi
RETVAL=$?
if [ $RETVAL -eq 0 ]; then