[CalendarServer-changes] [8597] CalDAVTester/trunk/odsetup.py

[source_changes at macosforge.org]

Revision: 8597
          http://trac.macosforge.org/projects/calendarserver/changeset/8597
Author:   cdaboo at apple.com
Date:     2012-01-26 19:04:24 -0800 (Thu, 26 Jan 2012)
Log Message:
-----------
Update paths.

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2012-01-27 00:54:49 UTC (rev 8596)
+++ CalDAVTester/trunk/odsetup.py	2012-01-27 03:04:24 UTC (rev 8597)
@@ -31,11 +31,13 @@
 from subprocess import Popen, PIPE
 import xml.parsers.expat
 
+sys_root         = "/Applications/Server.app/Contents/ServerRoot"
+
 diradmin_user    = "admin"
 diradmin_pswd    = ""
 directory_node   = "/LDAPv3/127.0.0.1"
-utility          = "/usr/sbin/calendarserver_manage_principals"
-cmdutility       = "/usr/sbin/calendarserver_command_gateway"
+utility          = sys_root + "/usr/sbin/calendarserver_manage_principals"
+cmdutility       = sys_root + "/usr/sbin/calendarserver_command_gateway"
 
 verbose = False
 veryverbose = False
@@ -44,7 +46,7 @@
 
 details = {
     "caldav": {
-        "config": "/etc/caldavd/caldavd.plist",
+        "config": sys_root + "/etc/caldavd/caldavd.plist",
         "serverinfo": "scripts/server/serverinfo-caldav.xml"
     },
 }
@@ -276,7 +278,7 @@
         plist["SudoersFile"]
     except KeyError:
         # add SudoersFile entry to caldavd.plist
-        plist["SudoersFile"] = "/etc/caldavd/sudoers.plist"
+        plist["SudoersFile"] = sys_root + "/etc/caldavd/sudoers.plist"
         writePlist(plist,config)
 
     try:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120126/abd8c59f/attachment-0001.html>