Revision: 903 http://trac.macosforge.org/projects/calendarserver/changeset/903 Author: dreid@apple.com Date: 2007-01-03 10:07:13 -0800 (Wed, 03 Jan 2007) Log Message: ----------- Fix bin/caldavd typo that was causing -g not to be passed on. Make sure we install the twisted package so we get the caldav plugin installed. Fix launchd.plist to use the new bin/caldavd Modified Paths: -------------- CalendarServer/trunk/bin/caldavd CalendarServer/trunk/conf/launchd.plist CalendarServer/trunk/setup.py Modified: CalendarServer/trunk/bin/caldavd =================================================================== --- CalendarServer/trunk/bin/caldavd 2007-01-02 22:38:29 UTC (rev 902) +++ CalendarServer/trunk/bin/caldavd 2007-01-03 18:07:13 UTC (rev 903) @@ -96,7 +96,7 @@ 'f') configfile="-f ${OPTARG}"; ;; 'T') twistdpath="${OPTARG}"; ;; 'u') username="-u ${OPTARG}"; ;; - 'g') grouname="-g ${OPTARG}"; ;; + 'g') groupname="-g ${OPTARG}"; ;; 'P') plugin_name="${OPTARG}"; ;; esac; done; Modified: CalendarServer/trunk/conf/launchd.plist =================================================================== --- CalendarServer/trunk/conf/launchd.plist 2007-01-02 22:38:29 UTC (rev 902) +++ CalendarServer/trunk/conf/launchd.plist 2007-01-03 18:07:13 UTC (rev 903) @@ -26,19 +26,24 @@ <key>Disabled</key> <true/> + <key>EnvironmentVariables</key> + <dict> + <key>PATH</key> + <string>/usr/bin:/usr/share/caldavd/bin</string> + <key>PYTHONPATH</key> + <string>/usr/share/caldavd/lib/python</string> + </dict> + <key>ProgramArguments</key> <array> <string>/usr/sbin/caldavd</string> <string>-X</string> - <string>start</string> + <string>-u</string> + <string>calendar</string> + <string>-g</string> + <string>calendar</string> </array> - <key>UserName</key> - <string>calendar</string> - - <key>GroupName</key> - <string>calendar</string> - <key>InitGroups</key> <true/> @@ -50,6 +55,5 @@ <key>StandardErrorPath</key> <string>/var/log/caldavd/error.log</string> - </dict> </plist> Modified: CalendarServer/trunk/setup.py =================================================================== --- CalendarServer/trunk/setup.py 2007-01-02 22:38:29 UTC (rev 902) +++ CalendarServer/trunk/setup.py 2007-01-03 18:07:13 UTC (rev 903) @@ -92,7 +92,8 @@ platforms = [ "all" ], packages = [ "twistedcaldav", "twistedcaldav.directory", "twistedcaldav.method", "twistedcaldav.query", - "twistedcaldav.admin", "twistedcaldav.py" ], + "twistedcaldav.admin", "twistedcaldav.py", + "twisted" ], package_data = { "twisted": ["plugins/caldav.py"] }, scripts = [ "bin/caldavd", "bin/caladmin" ], data_files = data_files