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

[source_changes at macosforge.org]

Revision: 14821
          http://trac.calendarserver.org//changeset/14821
Author:   sagen at apple.com
Date:     2015-05-22 14:40:28 -0700 (Fri, 22 May 2015)
Log Message:
-----------
Turn on trash feature in bin/testserver

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

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2015-05-22 11:31:22 UTC (rev 14820)
+++ CalendarServer/trunk/bin/testserver	2015-05-22 21:40:28 UTC (rev 14821)
@@ -114,11 +114,11 @@
 
 # Modify the plist
 
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['HTTPPort'] = 18008; f['BindHTTPPorts'] = [18008]; f['SSLPort'] = 18443; f['BindSSLPorts'] = [18443]; f['Notifications']['Services']['AMP']['Port'] = 62312; 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');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['EnableTrashCollection'] = True; f['HTTPPort'] = 18008; f['BindHTTPPorts'] = [18008]; f['SSLPort'] = 18443; f['BindSSLPorts'] = [18443]; f['Notifications']['Services']['AMP']['Port'] = 62312; 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');"
 
 # Modify serverinfo to update ports
 
-sed "s/8008/18008/g;s/8443/18443/g" "${serverinfo}" > "${configdir}/serverinfo-cdt.xml"
+sed "s/8008/18008/g;s/8443/18443/g;s/<\!-- \(<feature>trash-collection<\/feature>\) -->/\1/g" "${serverinfo}" > "${configdir}/serverinfo-cdt.xml"
 serverinfo="${configdir}/serverinfo-cdt.xml"
 
 # Start the server
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150522/5f78e8fd/attachment.html>