diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-11-04 15:17:22 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-11-04 15:17:22 +0000 |
| commit | 69e5e8d0adc7d841c1b5c2d24f2c8228563cc66f (patch) | |
| tree | d211f18170b76df601e86fe2491c7efa161d0483 /contrib/tor.sh.in | |
| parent | f7a30fa73ec8fbbc850ed39f0206bf2fe1172f10 (diff) | |
| download | tor-69e5e8d0adc7d841c1b5c2d24f2c8228563cc66f.tar tor-69e5e8d0adc7d841c1b5c2d24f2c8228563cc66f.tar.gz | |
Merge RPM spec patch from jbash
svn:r2674
Diffstat (limited to 'contrib/tor.sh.in')
| -rw-r--r-- | contrib/tor.sh.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/tor.sh.in b/contrib/tor.sh.in index dfde1f6a4..c5d79b88c 100644 --- a/contrib/tor.sh.in +++ b/contrib/tor.sh.in @@ -10,10 +10,12 @@ TORGROUP= TORBIN=@BINDIR@/tor TORPID=@LOCALSTATEDIR@/run/tor/tor.pid TORLOG=@LOCALSTATEDIR@/log/tor/tor.log +TORDATA=@LOCALSTATEDIR@/lib/tor + TORCONF=@CONFDIR@/torrc # Strictly speaking, we don't need to su if we have --user and --group. # "Belt and suspenders," says jbash. -TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1" +TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1 --datadirectory $TORDATA" if [ "x$TORUSER" != "x" ]; then TORARGS="$TORARGS --user $TORUSER" fi @@ -56,8 +58,8 @@ case "$1" in echo " ERROR!" fi else - echo "Unable to kill tor: $TORPID does not exist" - RETVAL=1 + echo "Unable to kill tor: $TORPID does not exist. Assuming already dead." + RETVAL=0 fi ;; |