[CalendarServer-changes] [9246] CalendarServer/trunk/contrib/migration

[source_changes at macosforge.org]

Revision: 9246
          http://trac.macosforge.org/projects/calendarserver/changeset/9246
Author:   sagen at apple.com
Date:     2012-05-14 09:56:07 -0700 (Mon, 14 May 2012)
Log Message:
-----------
Turn on APNS if push was enabled in previous system.

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

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-05-14 16:51:03 UTC (rev 9245)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2012-05-14 16:56:07 UTC (rev 9246)
@@ -358,7 +358,7 @@
         newCalDAVDPlist = { }
 
     log("Processing %s and %s" % (oldCalDAVPlistPath, oldCardDAVDPlistPath))
-    mergePlist(oldCalDAVDPlist, oldCardDAVDPlist, newCalDAVDPlist)
+    adminChanges = mergePlist(oldCalDAVDPlist, oldCardDAVDPlist, newCalDAVDPlist)
 
     newCalDAVDPlist["ServerRoot"] = newServerRootValue
     newCalDAVDPlist["DocumentRoot"] = "Documents"
@@ -371,9 +371,17 @@
     log("Writing %s" % (newConfigFile,))
     writePlist(newCalDAVDPlist, newConfigFile)
 
+    for key, value in adminChanges:
+        log("Setting %s to %s via serveradmin...")
+        ret = subprocess.call([SERVER_ADMIN, "settings", "calendar:%s=%s" % (key, value)])
+        log("serveradmin exited with %d" % (ret,))
 
+
+
 def mergePlist(caldav, carddav, combined):
 
+    adminChanges = []
+
     # Copy all non-ignored keys
     for key in carddav:
         if key not in ignoredKeys and key not in specialKeys:
@@ -403,6 +411,7 @@
     try:
         if caldav["Notifications"]["Services"]["XMPPNotifier"]["Enabled"]:
             caldav["Notifications"]["Services"]["XMPPNotifier"]["Enabled"] = False
+        adminChanges.append(("EnableAPNS", "True"))
     except KeyError:
         pass
 
@@ -448,7 +457,9 @@
     # If SSL is enabled, redirect HTTP to HTTPS.
     combined["RedirectHTTPToHTTPS"] = enableSSL
 
+    return adminChanges
 
+
 def log(msg):
     try:
         timestamp = datetime.datetime.now().strftime("%b %d %H:%M:%S")

Modified: CalendarServer/trunk/contrib/migration/test/test_migrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/test/test_migrator.py	2012-05-14 16:51:03 UTC (rev 9245)
+++ CalendarServer/trunk/contrib/migration/test/test_migrator.py	2012-05-14 16:56:07 UTC (rev 9246)
@@ -97,7 +97,8 @@
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
         # SSL off for both services
@@ -133,7 +134,8 @@
             "SSLPrivateKey": "",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
         # SSL on for only caldav
@@ -169,7 +171,8 @@
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
         # SSL on for only carddav
@@ -205,7 +208,8 @@
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
         # Non standard ports
@@ -241,7 +245,8 @@
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
 
@@ -274,7 +279,8 @@
             "SSLPrivateKey": "",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
         # Only CalDAV (Lion -> Lion)
@@ -302,7 +308,8 @@
             "SSLPrivateKey": "/etc/certificates/test.key.pem",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
 
@@ -321,7 +328,8 @@
             "SSLPrivateKey": "",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
 
@@ -366,7 +374,8 @@
             "SSLPrivateKey": "",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
 
@@ -403,7 +412,8 @@
             "SSLPrivateKey": "",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [])
         self.assertEquals(newCombined, expected)
 
 
@@ -440,7 +450,8 @@
             "SSLPrivateKey": "",
         }
         newCombined = { }
-        mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        adminChanges = mergePlist(oldCalDAV, oldCardDAV, newCombined)
+        self.assertEquals(adminChanges, [("EnableAPNS", "True")])
         self.assertEquals(newCombined, expected)
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120514/8ffb70f4/attachment.html>