[CalendarServer-changes] [10095] CalendarServer/branches/release/CalendarServer-4.2-dev/contrib/ migration/calendarmigrator.py

[source_changes at macosforge.org]

Revision: 10095
          http://trac.calendarserver.org//changeset/10095
Author:   sagen at apple.com
Date:     2012-11-27 19:21:18 -0800 (Tue, 27 Nov 2012)
Log Message:
-----------
Don't set EnableCalDAV or EnableCardDAV directly in the plist; let serveradmin and the plugins do that.  Otherwise, servermgr_addressbook will think it doesn't need to load the contacts webapp

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-4.2-dev/contrib/migration/calendarmigrator.py

Modified: CalendarServer/branches/release/CalendarServer-4.2-dev/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.2-dev/contrib/migration/calendarmigrator.py	2012-11-28 02:50:35 UTC (rev 10094)
+++ CalendarServer/branches/release/CalendarServer-4.2-dev/contrib/migration/calendarmigrator.py	2012-11-28 03:21:18 UTC (rev 10095)
@@ -412,8 +412,9 @@
     newCalDAVDPlist["DocumentRoot"] = "Documents"
     newCalDAVDPlist["DataRoot"] = newDataRootValue
 
-    newCalDAVDPlist["EnableCalDAV"] = enableCalDAV
-    newCalDAVDPlist["EnableCardDAV"] = enableCardDAV
+    # These will get set when setRunState runs
+    newCalDAVDPlist["EnableCalDAV"] = False
+    newCalDAVDPlist["EnableCardDAV"] = False
 
     log("Writing %s" % (newConfigFile,))
     writePlist(newCalDAVDPlist, newConfigFile)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121127/a007d6fc/attachment.html>