[CalendarServer-changes] [8481] CalendarServer/trunk/contrib/migration/calendarmigrator.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 3 15:24:12 PST 2012
Revision: 8481
http://trac.macosforge.org/projects/calendarserver/changeset/8481
Author: sagen at apple.com
Date: 2012-01-03 15:24:11 -0800 (Tue, 03 Jan 2012)
Log Message:
-----------
Removing obsolete notification configuration, and referencing new serveradmin location.
Modified Paths:
--------------
CalendarServer/trunk/contrib/migration/calendarmigrator.py
Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-01-03 22:02:19 UTC (rev 8480)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-01-03 23:24:11 UTC (rev 8481)
@@ -31,6 +31,7 @@
from plistlib import readPlist, readPlistFromString, writePlist
+SERVER_APP_ROOT = "/Applications/Server.app/Contents/ServerRoot"
CALDAV_LAUNCHD_KEY = "org.calendarserver.calendarserver"
CARDDAV_LAUNCHD_KEY = "org.addressbookserver.addressbookserver"
LOG = "/Library/Logs/Migration/calendarmigrator.log"
@@ -44,7 +45,7 @@
NEW_SERVER_DIR = "Calendar and Contacts"
NEW_SERVER_ROOT = "/Library/Server/" + NEW_SERVER_DIR
RESOURCE_MIGRATION_TRIGGER = "trigger_resource_migration"
-SERVER_ADMIN = "/usr/sbin/serveradmin"
+SERVER_ADMIN = "%s/usr/sbin/serveradmin" % (SERVER_APP_ROOT,)
DITTO = "/usr/bin/ditto"
@@ -249,8 +250,6 @@
enableCardDAV
)
- configureNotifications()
-
triggerResourceMigration(newServerRoot)
setRunState(options, enableCalDAV, enableCardDAV)
@@ -326,17 +325,6 @@
log("serveradmin exited with %d" % (ret,))
-def configureNotifications():
- """
- Fetch notification settings from servermgr_notification via server admin
- and write them into caldavd.plist
- """
-
- log("Configuring notifications via serveradmin")
- ret = subprocess.call([SERVER_ADMIN, "command", "calendar:command=configureNotifications"])
- log("serveradmin exited with %d" % (ret,))
-
-
def triggerResourceMigration(newServerRootValue):
"""
Leave a file in the server root to act as a signal that the server
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120103/5ed57738/attachment.html>
More information about the calendarserver-changes
mailing list