[CalendarServer-changes] [6701] CalendarServer/trunk/contrib/migration/calendarmigrator.py

[source_changes at macosforge.org]

Revision: 6701
          http://trac.macosforge.org/projects/calendarserver/changeset/6701
Author:   sagen at apple.com
Date:     2010-12-17 12:12:23 -0800 (Fri, 17 Dec 2010)
Log Message:
-----------
Two migration issues:
Modifies the RedirectHTTPToHTTPS plist key to match EnableSSL
Disables calendar and addressbook services until we can get webappctl integrated (admin must start services manually after upgrade/migration)

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarmigrator.py

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2010-12-17 18:57:28 UTC (rev 6700)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2010-12-17 20:12:23 UTC (rev 6701)
@@ -110,7 +110,6 @@
 ProxyDBService
 ProxyLoadFromFile
 ReadPrincipals
-RedirectHTTPToHTTPS
 RejectClients
 ResourceService
 ResponseCompression
@@ -149,6 +148,7 @@
 ErrorLogFile
 MaxAddressBookMultigetHrefs
 MaxAddressBookQueryResults
+RedirectHTTPToHTTPS
 """.split()
 
 ignoredKkeys = """
@@ -205,6 +205,13 @@
             enableCalDAV, enableCardDAV = examineRunState(options)
             migrateConfiguration(options, newServerRootValue, enableCalDAV,
                 enableCardDAV)
+
+            # FIXME: For now, disable service because postgres isn't
+            # automatically starting (since launchd is directly starting
+            # calendar service)
+            enableCalDAV = False
+            enableCardDAV = False
+
             setRunState(options, enableCalDAV, enableCardDAV)
             triggerResourceMigration(newServerRootValue)
 
@@ -382,6 +389,9 @@
             if key not in ("node", "cacheTimeout", "xmlFile"):
                 del newCalDAVDPlist["DirectoryService"]["params"][key]
 
+    # If SSL is enabled, redirect HTTP to HTTPS.
+    enableSSL = newCalDAVDPlist.get("EnableSSL", False)
+    newCalDAVDPlist["RedirectHTTPToHTTPS"] = enableSSL
 
 
 def isServiceDisabled(source, service):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101217/6a02f4f3/attachment.html>