[CalendarServer-changes] [7508] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 7508
          http://trac.macosforge.org/projects/calendarserver/changeset/7508
Author:   wsanchez at apple.com
Date:     2011-05-19 17:22:56 -0700 (Thu, 19 May 2011)
Log Message:
-----------
Don't enable DirectoryAddressBook by default, since it only works with OD right now.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2011-05-20 00:22:35 UTC (rev 7507)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2011-05-20 00:22:56 UTC (rev 7508)
@@ -522,6 +522,8 @@
     <!-- Directory searching -->
     <key>DirectoryAddressBook</key>
     <dict>
+	<key>Enabled</key>
+	<true/>
         <key>params</key>
         <dict>
             <key>queryUserRecords</key>

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2011-05-20 00:22:35 UTC (rev 7507)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2011-05-20 00:22:56 UTC (rev 7508)
@@ -465,7 +465,7 @@
 
     # CardDAV Features
     "DirectoryAddressBook": {
-        "Enabled": True,
+        "Enabled": False,
         "type":    "twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService",
         "params":  directoryAddressBookBackingServiceDefaultParams["twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService"],
         "name":    "directory",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110519/ef02ad1f/attachment.html>