<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15247] CalendarServer/trunk/bin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15247">15247</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 13:45:59 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>"u" missed something.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbintestpods">CalendarServer/trunk/bin/testpods</a></li>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbintestpods"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testpods (15246 => 15247)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testpods 2015-10-28 19:32:32 UTC (rev 15246)
+++ CalendarServer/trunk/bin/testpods 2015-10-28 20:45:59 UTC (rev 15247)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> # Set up sandbox
</span><span class="cx">
</span><span class="cx"> sandboxdir="/tmp/cdt_server_sandbox💣"
</span><del>-sandboxdirutf8="/tmp/cdt_server_sandbox\ud83d\udca3"
</del><ins>+sandboxdir_u="/tmp/cdt_server_sandbox\ud83d\udca3"
</ins><span class="cx">
</span><span class="cx"> if [ -d "${sandboxdir}" ]; then
</span><span class="cx"> rm -rf "${sandboxdir}"
</span><span class="lines">@@ -103,9 +103,9 @@
</span><span class="cx"> serverrootA="${sandboxdir}/podA"
</span><span class="cx"> serverrootB="${sandboxdir}/podB"
</span><span class="cx">
</span><del>-configdirutf8="${sandboxdirutf8}/Config"
-serverrootAutf8="${sandboxdirutf8}/podA"
-serverrootButf8="${sandboxdirutf8}/podB"
</del><ins>+configdir_u="${sandboxdir_u}/Config"
+serverrootA_u="${sandboxdir_u}/podA"
+serverrootB_u="${sandboxdir_u}/podB"
</ins><span class="cx">
</span><span class="cx"> mkdir -p "${configdir}/auth"
</span><span class="cx"> mkdir -p "${serverrootA}/Logs" "${serverrootA}/Run" "${serverrootA}/Data/Documents"
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx">
</span><span class="cx"> # Modify the plists
</span><span class="cx">
</span><del>-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['ConfigRoot'] = '${configdirutf8}'; f['RunRoot'] = 'Run'; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podA.plist'); f['ImportConfig'] = '${configdirutf8}/caldavd-cdt.plist'; f['ServerRoot'] = '${serverrootAutf8}'; f['ConfigRoot'] = '${configdirutf8}'; f['ProxyLoadFromFile'] = '${configdirutf8}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${configdirutf8}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${configdirutf8}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${configdirutf8}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podA.plist');"
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podB.plist'); f['ImportConfig'] = '${configdirutf8}/caldavd-cdt.plist'; f['ServerRoot'] = '${serverrootButf8}'; f['ConfigRoot'] = '${configdirutf8}'; f['ProxyLoadFromFile'] = '${configdirutf8}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${configdirutf8}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${configdirutf8}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${configdirutf8}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podB.plist');"
</del><ins>+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['ConfigRoot'] = u'${configdir_u}'; f['RunRoot'] = 'Run'; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podA.plist'); f['ImportConfig'] = u'${configdir_u}/caldavd-cdt.plist'; f['ServerRoot'] = u'${serverrootA_u}'; f['ConfigRoot'] = u'${configdir_u}'; f['ProxyLoadFromFile'] = u'${configdir_u}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = u'${configdir_u}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = u'${configdir_u}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = [u'${configdir_u}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podA.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt-podB.plist'); f['ImportConfig'] = u'${configdir_u}/caldavd-cdt.plist'; f['ServerRoot'] = u'${serverrootB_u}'; f['ConfigRoot'] = u'${configdir_u}'; f['ProxyLoadFromFile'] = u'${configdir_u}/auth/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = u'${configdir_u}/auth/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = u'${configdir_u}/auth/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = [u'${configdir_u}/auth/augments-cdt.xml']; plistlib.writePlist(f, '${configdir}/caldavd-cdt-podB.plist');"
</ins><span class="cx">
</span><span class="cx"> runpod() {
</span><span class="cx"> local podsuffix="$1"; shift;
</span></span></pre></div>
<a id="CalendarServertrunkbintestserver"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testserver (15246 => 15247)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver 2015-10-28 19:32:32 UTC (rev 15246)
+++ CalendarServer/trunk/bin/testserver 2015-10-28 20:45:59 UTC (rev 15247)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> # Set up sandbox
</span><span class="cx">
</span><span class="cx"> sandboxdir="/tmp/cdt_server_sandbox💣"
</span><del>-sandboxdirutf8="/tmp/cdt_server_sandbox\ud83d\udca3"
</del><ins>+sandboxdir_u="/tmp/cdt_server_sandbox\ud83d\udca3"
</ins><span class="cx">
</span><span class="cx"> if [ -d "${sandboxdir}" ]; then
</span><span class="cx"> rm -rf "${sandboxdir}"
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> configdir="${sandboxdir}/Config"
</span><span class="cx"> datadir="${sandboxdir}/Data"
</span><span class="cx">
</span><del>-configdirutf8="${sandboxdirutf8}/Config"
-datadirutf8="${sandboxdirutf8}/Data"
</del><ins>+configdir_u="${sandboxdir_u}/Config"
+datadir_u="${sandboxdir_u}/Data"
</ins><span class="cx">
</span><span class="cx"> mkdir -p "${configdir}/Config" "${sandboxdir}/Logs" "${sandboxdir}/Run" "${datadir}/Documents"
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> # Modify the plist
</span><span class="cx">
</span><del>-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'] = '${sandboxdirutf8}'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = '${datadirutf8}/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = '${datadirutf8}/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = '${datadirutf8}/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = ['${datadirutf8}/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
</del><ins>+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'] = u'${sandboxdir_u}'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = u'${datadir_u}/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = u'${datadir_u}/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = u'${datadir_u}/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = [u'${datadir_u}/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
</ins><span class="cx">
</span><span class="cx"> # Modify serverinfo to update ports
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>