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

[source_changes at macosforge.org]

Revision: 8218
          http://trac.macosforge.org/projects/calendarserver/changeset/8218
Author:   dre at apple.com
Date:     2011-10-21 15:04:11 -0700 (Fri, 21 Oct 2011)
Log Message:
-----------
Define AugmenetService in caldavd.plist, move patchConfig up a bit to happen before resource creation

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

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2011-10-21 18:55:48 UTC (rev 8217)
+++ CalDAVTester/trunk/odsetup.py	2011-10-21 22:04:11 UTC (rev 8218)
@@ -326,7 +326,14 @@
 
 def patchConfig(config, admin):
     """
-    Patch the caldavd.plist file to make sure the proper admin principal is configured.
+    Patch the caldavd.plist file to make sure:
+       * the proper admin principal is configured
+       * DS Search node is set to /LDAPv3/127.0.0.1
+       * iMIP is disabled
+       * SACLs are disabled
+       * CalDAV and CardDAV are enabled
+       * EnableAnonymousReadRoot is enabled
+       * AugmentService is configured
 
     @param config: file path to caldavd.plist
     @type config: str
@@ -353,6 +360,7 @@
 
     # Needed for CDT
     plist["EnableAnonymousReadRoot"] = True
+    plist["AugmentService"] = {'params': {'xmlFiles': ['augments.xml']}, 'type': 'twistedcaldav.directory.augment.AugmentXMLDB'}
 
     writePlist(plist, config)
 
@@ -692,6 +700,9 @@
             # Patch the sudoers file for the superuser principal.
             patchSudoers(sudoers)
     
+            # Patch the caldavd.plist file with the testadmin user's guid-based principal-URL
+            patchConfig(config, "/principals/__uids__/%s/" % (guids["testadmin"],))
+
             # Now generate the OD accounts (caching guids as we go).
             if protocol == "caldav":
                 loadLists(config, "/Places", locations)
@@ -700,9 +711,6 @@
             doToAccounts(config, protocol, createUser)
             doGroupMemberships()
             
-            # Patch the caldavd.plist file with the testadmin user's guid-based principal-URL
-            patchConfig(config, "/principals/__uids__/%s/" % (guids["testadmin"],))
-            
             # Create an appropriate serverinfo.xml file from the template
             buildServerinfo(serverinfo_default, hostname, port, sslport, authtype, docroot)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111021/cfa63664/attachment.html>