These settings are required for those using launchd in OSX 10.4.

This is a crude but functional way to insert them for now.

svn:r6820

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 5e74976bfa37b1d8cf2d8be5dac81ab0b9d17321..a8991bb3658bdfe8a55583aa23ae077abea8bdad 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -119,9 +119,19 @@ if [ $OS = "tiger" ]; then
   if [ -f $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist ]; then
      cp $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist /System/Library/LaunchDaemons/net.freehaven.tor.plist
      chmod 644 /System/Library/LaunchDaemons/net.freehaven.tor.plist
+     grep -q "#--START" $TARGET/torrc
+  if [ "$?" -ne "0" ]; then
+     echo "#--START required settings--" >> $TARGET/torrc
+     echo "RunAsDaemon 0" >> $TARGET/torrc
+     echo "Log notice file $TARGET/var/log/tor/tor.log" >> $TARGET/torrc
+     echo "DataDirectory $TARGET/var/lib/tor" >> $TARGET/torrc
+     echo "Group daemon" >> $TARGET/torrc
+     echo "User _tor" >> $TARGET/torrc
+     echo "PidFile /var/run/Tor.pid" >> $TARGET/torrc
+     echo "#--END required settings--" >> $TARGET/torrc
+  fi
      /bin/launchctl load /System/Library/LaunchDaemons/net.freehaven.tor.plist
      /bin/launchctl start net.freehaven.tor
-  fi
 else
   if [ -d /Library/StartupItems/Tor ]; then
     rm -f /Library/StartupItems/Tor/Tor.loc