Make OS X log happily to /var/log/Tor

svn:r3775

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 8919f376c95246ab0950b9c18662033b1956c198..e3689589a21a73f131933d72982ed592897df2e2 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -12,6 +12,7 @@ TORUSER=_tor
 TORGROUP=daemon
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
+LOGDIR=$TARGET/var/log/tor
 
 # Create user $TORUSER in group daemon.  If it's already there, great.
 $ADDSYSUSER $TORUSER "Tor System user" $TORDIR
@@ -20,10 +21,16 @@ $ADDSYSUSER $TORUSER "Tor System user" $TORDIR
 if [ ! -d $TORDIR ]; then
   mkdir -p $TORDIR
 fi
+if [ ! -d $LOGDIR ]; then
+  mkdir -p $LOGDIR
+fi
 # Check its permissions.
 chown $TORUSER $TORDIR
 chgrp daemon $TORDIR
 chmod 700 $TORDIR
+chown $TORUSER $LOGDIR
+chgrp daemon $LOGDIR
+chmod 700 $LOGDIR
 
 # Create the configuration file only if there wan't one already.
 if [ ! -f $TARGET/torrc ]; then
@@ -44,3 +51,9 @@ ln -sf $TARGET/tor_resolve .
 cd /usr/share/man/man1
 MAN1=$TARGET/man/man1
 ln -sf $MAN1/*.1 .
+
+if [ ! -e /var/log/tor -o -L /var/log/tor ]; then
+  cd /var/log
+  rm -f tor
+  ln -sf $LOGDIR tor
+fi
\ No newline at end of file

diff --git a/doc/TODO b/doc/TODO
index ddcf4d4d62039eb80b09f7928078c0ab0bd8e1fd..c83a5e88e744b4b6e431deb7694f592d6e98afd2 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -118,8 +118,10 @@ N - Document where OSX, windows logs go, where stuff is installed.
 N - Vet all pending installer patches
     - Win32 installer plus privoxy, sockscap/freecap, etc.
     - Vet win32 systray helper code
-N - Make OSX man pages go into man directory.
-  - Make logs do into platform default locations.
+  o Make OSX man pages go into man directory.
+N . Make logs go into platform default locations.
+    o OSX
+    - 
 
  Correctness
    - Mark bugs for 010 or post 010 in bugtracker.