tor: fix tor init script (#2279)

SVN-Revision: 8532

diff --git a/net/tor/files/tor.init b/net/tor/files/tor.init
index a6b8235850ff2c65add6abc98d7426de395d7c49..6944e88685c3b59a6bdeadec0edc3383d39aebc5 100644 (file)
--- a/net/tor/files/tor.init
+++ b/net/tor/files/tor.init
@@ -5,13 +5,17 @@ START=50
 BIN=tor
 DEFAULT=/etc/default/$BIN
 LOG_D=/var/log/$BIN
+LIB_D=/var/lib/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
+RUN_USER=$BIN
+RUN_GROUP=$BIN
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $LOG_D
-       mkdir -p $RUN_D
+       [ -d $LIB_D ] || mkdir -p $LOG_D
+       [ -d $LIB_D ] || ( mkdir -p $LIB_D && chown $RUN_USER:$RUN_GROUP $LIB_D )
+       [ -d $RUN_D ] || mkdir -p $RUN_D
        $BIN $OPTIONS
 }
 

diff --git a/net/tor/files/torrc b/net/tor/files/torrc
index e5cf75b6e1224bdd7a3508f8ebc19799832aec66..edb7191f5f76ab97f5f5b5be8910fa5e53e9236e 100644 (file)
--- a/net/tor/files/torrc
+++ b/net/tor/files/torrc
@@ -59,7 +59,7 @@ RunAsDaemon 1
 
 ## The directory for keeping all the keys/etc. By default, we store
 ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-#DataDirectory /var/lib/tor
+DataDirectory /var/lib/tor
 
 ## The port on which Tor will listen for local connections from Tor controller
 ## applications, as documented in control-spec.txt.  NB: this feature is