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

[source_changes at macosforge.org]

Revision: 14677
          http://trac.calendarserver.org//changeset/14677
Author:   sagen at apple.com
Date:     2015-04-13 10:31:27 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
Change ports used by testserver CDT so a client configured to use the default ports does not interfere

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

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2015-04-10 21:15:30 UTC (rev 14676)
+++ CalendarServer/trunk/bin/testserver	2015-04-13 17:31:27 UTC (rev 14677)
@@ -111,8 +111,13 @@
 
 # Modify the 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');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['BindHTTPPorts'] = [18008]; 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"
+serverinfo="${configdir}/serverinfo-cdt.xml"
+
 # 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/20150413/eed4e73f/attachment.html>