[CalendarServer-changes] [13992] CalendarServer/trunk/bin/testserver

[source_changes at macosforge.org]

Revision: 13992
          http://trac.calendarserver.org//changeset/13992
Author:   sagen at apple.com
Date:     2014-09-22 12:04:09 -0700 (Mon, 22 Sep 2014)
Log Message:
-----------
Just use python to tweak the CDT sandbox plist

Modified Paths:
--------------
    CalendarServer/trunk/bin/testserver

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2014-09-22 18:49:33 UTC (rev 13991)
+++ CalendarServer/trunk/bin/testserver	2014-09-22 19:04:09 UTC (rev 13992)
@@ -107,19 +107,9 @@
 cp conf/auth/accounts-test.xml "${datadir}/accounts-cdt.xml"
 
 # Modify the plist
-pb="/usr/libexec/PlistBuddy"
 
-"${pb}" -c "Set :ServerRoot ${sandboxdir}" "${configdir}/caldavd-cdt.plist"
-"${pb}" -c "Set :ConfigRoot Config" "${configdir}/caldavd-cdt.plist"
-"${pb}" -c "Set :RunRoot Run" "${configdir}/caldavd-cdt.plist"
-"${pb}" -c "Set :ProxyLoadFromFile ${datadir}/proxies-cdt.xml" "${configdir}/caldavd-cdt.plist"
-"${pb}" -c "Set :ResourceService:params:xmlFile ${datadir}/resources-cdt.xml" "${configdir}/caldavd-cdt.plist"
-"${pb}" -c "Set :DirectoryService:params:xmlFile ${datadir}/accounts-cdt.xml" "${configdir}/caldavd-cdt.plist"
-"${pb}" -c "Set :AugmentService:params:xmlFiles:0 ${datadir}/augments-cdt.xml" "${configdir}/caldavd-cdt.plist"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['ServerRoot'] = '${sandboxdir}'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = '${datadir}/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${datadir}/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${datadir}/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${datadir}/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
 
-# For now, disable Kerberos since it's crashing in getServerPrincipalDetails when run with -d
-"${pb}" -c "Set :Authentication:Kerberos:Enabled False" "${configdir}/caldavd-cdt.plist"
-
 # Start the server
 
 "${wd}/bin/run" -nd -c "${configdir}/caldavd-cdt.plist"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140922/8dfb36be/attachment.html>