[CalendarServer-changes] [14781] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue May 12 14:02:52 PDT 2015
Revision: 14781
http://trac.calendarserver.org//changeset/14781
Author: sagen at apple.com
Date: 2015-05-12 14:02:52 -0700 (Tue, 12 May 2015)
Log Message:
-----------
New location for server prefs file
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tools/changeip_calendar.py
CalendarServer/trunk/calendarserver/tools/diagnose.py
CalendarServer/trunk/conf/caldavd-apple.plist
CalendarServer/trunk/conf/caldavd-test.plist
Modified: CalendarServer/trunk/calendarserver/tools/changeip_calendar.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/changeip_calendar.py 2015-05-12 16:34:21 UTC (rev 14780)
+++ CalendarServer/trunk/calendarserver/tools/changeip_calendar.py 2015-05-12 21:02:52 UTC (rev 14781)
@@ -30,7 +30,7 @@
Return the ServerRoot value from the servermgr_calendar.plist. If not
present, return the default.
"""
- plist = "/Library/Preferences/com.apple.servermgr_calendar.plist"
+ plist = "/Library/Server/Preferences/Calendar.plist"
serverRoot = u"/Library/Server/Calendar and Contacts"
if os.path.exists(plist):
serverRoot = plistlib.readPlist(plist).get("ServerRoot", serverRoot)
Modified: CalendarServer/trunk/calendarserver/tools/diagnose.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/diagnose.py 2015-05-12 16:34:21 UTC (rev 14780)
+++ CalendarServer/trunk/calendarserver/tools/diagnose.py 2015-05-12 21:02:52 UTC (rev 14781)
@@ -30,7 +30,7 @@
import OpenSSL
-PREFS_PLIST = "/Library/Preferences/com.apple.servermgr_calendar.plist"
+PREFS_PLIST = "/Library/Server/Preferences/Calendar.plist"
SSLPrivateKey = ""
SSLCertAdmin = ""
SSLPassPhraseDialog = ""
@@ -503,10 +503,9 @@
@rtype: C{unicode}
"""
try:
- plist = "/Library/Preferences/com.apple.servermgr_calendar.plist"
serverRoot = u"/Library/Server/Calendar and Contacts"
- if os.path.exists(plist):
- serverRoot = readPlist(plist).get("ServerRoot", serverRoot)
+ if os.path.exists(PREFS_PLIST):
+ serverRoot = readPlist(PREFS_PLIST).get("ServerRoot", serverRoot)
if isinstance(serverRoot, str):
serverRoot = serverRoot.decode("utf-8")
return serverRoot
Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist 2015-05-12 16:34:21 UTC (rev 14780)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2015-05-12 21:02:52 UTC (rev 14781)
@@ -577,7 +577,7 @@
-->
<key>Includes</key>
<array>
- <string>/Library/Preferences/com.apple.servermgr_calendar.plist</string>
+ <string>/Library/Server/Preferences/Calendar.plist</string>
<string>caldavd-system.plist</string>
<string>caldavd-user.plist</string>
</array>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2015-05-12 16:34:21 UTC (rev 14780)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2015-05-12 21:02:52 UTC (rev 14781)
@@ -49,7 +49,7 @@
<false/>
</dict>
<key>SocketRoot</key>
- <string>/tmp/calendarserver</string>
+ <string>/tmp/caldavd_requests</string>
<!-- HTTP port [0 = disable HTTP] -->
<key>HTTPPort</key>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150512/e32a37dd/attachment.html>
More information about the calendarserver-changes
mailing list