diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-18 12:46:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-18 12:46:11 +0200 |
| commit | c49eb50825895157e0edd16d7bb542779d57005c (patch) | |
| tree | 5d06cd441f0ec99268eb137aacd3328b5fb38d03 /package/tor/files | |
| parent | 428fa60f2f9456e977c9221650023d178c4e0c4f (diff) | |
update to latest upstream version, use config option User no su anymore required, fix stopping of tor
Diffstat (limited to 'package/tor/files')
| -rw-r--r-- | package/tor/files/tor.init | 8 | ||||
| -rw-r--r-- | package/tor/files/tor.postinst | 2 | ||||
| -rw-r--r-- | package/tor/files/torrc | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init index 58a8d4759..f75fca49b 100644 --- a/package/tor/files/tor.init +++ b/package/tor/files/tor.init @@ -11,12 +11,12 @@ autostart) ;; start) [ -d /var/run/tor ] || mkdir -p /var/run/tor - [ -d /tmp/.tor ] || mkdir -p /tmp/.tor - chown tor:tor /tmp/.tor /var/run/tor - su - tor -c /usr/bin/tor + [ -d /etc/tor/.tor ] || mkdir -p /etc/tor/.tor + chown tor:tor /etc/tor/.tor /var/run/tor + /usr/bin/tor ;; stop) - kill $(pgrep -f /usr/bin/tor) + kill -15 $(pgrep -f /usr/bin/tor) ;; restart) sh $0 stop diff --git a/package/tor/files/tor.postinst b/package/tor/files/tor.postinst index b3bb981a1..7a374861b 100644 --- a/package/tor/files/tor.postinst +++ b/package/tor/files/tor.postinst @@ -3,4 +3,4 @@ add_rcconf tor tor NO gid=$(get_next_gid) add_group tor $gid -add_user tor $(get_next_uid) $gid /tmp/.tor +add_user tor $(get_next_uid) $gid /etc/tor diff --git a/package/tor/files/torrc b/package/tor/files/torrc index b533ce04c..9d230f1c7 100644 --- a/package/tor/files/torrc +++ b/package/tor/files/torrc @@ -124,3 +124,4 @@ RunAsDaemon 1 #ExitPolicy reject *:* # middleman only -- no exits allowed PidFile /var/run/tor/tor.pid +User tor |