<!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>[14949] CalendarServer/trunk</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/14949">14949</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 17:28:41 -0700 (Mon, 06 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>APNS cert paths now relative to ConfigRoot</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsconfigpy">CalendarServer/trunk/calendarserver/tools/config.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_configpy">CalendarServer/trunk/calendarserver/tools/test/test_config.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_gatewaypy">CalendarServer/trunk/calendarserver/tools/test/test_gateway.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/config.py (14948 => 14949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/config.py        2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/calendarserver/tools/config.py        2015-07-07 00:28:41 UTC (rev 14949)
</span><span class="lines">@@ -59,12 +59,6 @@
</span><span class="cx">     &quot;EnableSSL&quot;,
</span><span class="cx">     &quot;HTTPPort&quot;,
</span><span class="cx">     &quot;LogLevels&quot;,
</span><del>-    &quot;Notifications.Services.APNS.CalDAV.AuthorityChainPath&quot;,
-    &quot;Notifications.Services.APNS.CalDAV.CertificatePath&quot;,
-    &quot;Notifications.Services.APNS.CalDAV.PrivateKeyPath&quot;,
-    &quot;Notifications.Services.APNS.CardDAV.AuthorityChainPath&quot;,
-    &quot;Notifications.Services.APNS.CardDAV.CertificatePath&quot;,
-    &quot;Notifications.Services.APNS.CardDAV.PrivateKeyPath&quot;,
</del><span class="cx">     &quot;Notifications.Services.APNS.Enabled&quot;,
</span><span class="cx">     &quot;RedirectHTTPToHTTPS&quot;,
</span><span class="cx">     &quot;Scheduling.iMIP.Enabled&quot;,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_configpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_config.py (14948 => 14949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_config.py        2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/calendarserver/tools/test/test_config.py        2015-07-07 00:28:41 UTC (rev 14949)
</span><span class="lines">@@ -131,7 +131,6 @@
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;DefaultLogLevel&quot;], &quot;warn&quot;)
</span><span class="cx"> 
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;Enabled&quot;], False)
</span><del>-        self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;CalDAV&quot;][&quot;CertificatePath&quot;], &quot;/example/calendar.cer&quot;)
</del><span class="cx"> 
</span><span class="cx">         # Verify not all keys are present, such as umask which is not accessible
</span><span class="cx">         self.assertFalse(&quot;umask&quot; in results[&quot;result&quot;])
</span><span class="lines">@@ -150,7 +149,6 @@
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;EnableCardDAV&quot;], False)
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;EnableSSL&quot;], True)
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;Enabled&quot;], True)
</span><del>-        self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;CalDAV&quot;][&quot;CertificatePath&quot;], &quot;/example/changed.cer&quot;)
</del><span class="cx">         hostName = &quot;hostname_%s_%s&quot; % (unichr(208), u&quot;\ud83d\udca3&quot;)
</span><span class="cx">         self.assertTrue(results[&quot;result&quot;][&quot;ServerHostName&quot;].endswith(hostName))
</span><span class="cx"> 
</span><span class="lines">@@ -242,8 +240,6 @@
</span><span class="cx">             &lt;true/&gt;
</span><span class="cx">             &lt;key&gt;Notifications.Services.APNS.Enabled&lt;/key&gt;
</span><span class="cx">             &lt;true/&gt;
</span><del>-            &lt;key&gt;Notifications.Services.APNS.CalDAV.CertificatePath&lt;/key&gt;
-            &lt;string&gt;/example/changed.cer&lt;/string&gt;
</del><span class="cx">             &lt;key&gt;ServerRoot&lt;/key&gt;
</span><span class="cx">             &lt;string&gt;/You/Shall/Not/Pass&lt;/string&gt;
</span><span class="cx">             &lt;key&gt;ServerHostName&lt;/key&gt;
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_gatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py (14948 => 14949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py        2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py        2015-07-07 00:28:41 UTC (rev 14949)
</span><span class="lines">@@ -466,7 +466,6 @@
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;DefaultLogLevel&quot;], &quot;warn&quot;)
</span><span class="cx"> 
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;Enabled&quot;], False)
</span><del>-        self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;CalDAV&quot;][&quot;CertificatePath&quot;], &quot;/example/calendar.cer&quot;)
</del><span class="cx"> 
</span><span class="cx">         # This is a read only key that is returned
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;ServerRoot&quot;], self.absoluteServerRoot)
</span><span class="lines">@@ -489,7 +488,6 @@
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;EnableCardDAV&quot;], False)
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;EnableSSL&quot;], True)
</span><span class="cx">         self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;Enabled&quot;], True)
</span><del>-        self.assertEquals(results[&quot;result&quot;][&quot;Notifications&quot;][&quot;Services&quot;][&quot;APNS&quot;][&quot;CalDAV&quot;][&quot;CertificatePath&quot;], &quot;/example/changed.cer&quot;)
</del><span class="cx">         hostName = &quot;hostname_%s_%s&quot; % (unichr(208), u&quot;\ud83d\udca3&quot;)
</span><span class="cx">         self.assertTrue(results[&quot;result&quot;][&quot;ServerHostName&quot;].endswith(hostName))
</span><span class="cx"> 
</span><span class="lines">@@ -972,8 +970,6 @@
</span><span class="cx">             &lt;true/&gt;
</span><span class="cx">             &lt;key&gt;Notifications.Services.APNS.Enabled&lt;/key&gt;
</span><span class="cx">             &lt;true/&gt;
</span><del>-            &lt;key&gt;Notifications.Services.APNS.CalDAV.CertificatePath&lt;/key&gt;
-            &lt;string&gt;/example/changed.cer&lt;/string&gt;
</del><span class="cx">             &lt;key&gt;ServerHostName&lt;/key&gt;
</span><span class="cx">             &lt;string&gt;hostname_%s_%s&lt;/string&gt;
</span><span class="cx">         &lt;/dict&gt;
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14948 => 14949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py        2015-07-06 22:07:50 UTC (rev 14948)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py        2015-07-07 00:28:41 UTC (rev 14949)
</span><span class="lines">@@ -821,16 +821,16 @@
</span><span class="cx">                 &quot;EnableStaggering&quot; : False,
</span><span class="cx">                 &quot;StaggerSeconds&quot; : 3,
</span><span class="cx">                 &quot;CalDAV&quot; : {
</span><del>-                    &quot;CertificatePath&quot; : &quot;&quot;,
-                    &quot;PrivateKeyPath&quot; : &quot;&quot;,
-                    &quot;AuthorityChainPath&quot; : &quot;&quot;,
</del><ins>+                    &quot;CertificatePath&quot; : &quot;Certificates/apns:com.apple.calendar.cert.pem&quot;,
+                    &quot;PrivateKeyPath&quot; : &quot;Certificates/apns:com.apple.calendar.key.pem&quot;,
+                    &quot;AuthorityChainPath&quot; : &quot;Certificates/apns:com.apple.calendar.chain.pem&quot;,
</ins><span class="cx">                     &quot;Passphrase&quot; : &quot;&quot;,
</span><span class="cx">                     &quot;Topic&quot; : &quot;&quot;,
</span><span class="cx">                 },
</span><span class="cx">                 &quot;CardDAV&quot; : {
</span><del>-                    &quot;CertificatePath&quot; : &quot;&quot;,
-                    &quot;PrivateKeyPath&quot; : &quot;&quot;,
-                    &quot;AuthorityChainPath&quot; : &quot;&quot;,
</del><ins>+                    &quot;CertificatePath&quot; : &quot;Certificates/apns:com.apple.contact.cert.pem&quot;,
+                    &quot;PrivateKeyPath&quot; : &quot;Certificates/apns:com.apple.contact.key.pem&quot;,
+                    &quot;AuthorityChainPath&quot; : &quot;Certificates/apns:com.apple.contact.chain.pem&quot;,
</ins><span class="cx">                     &quot;Passphrase&quot; : &quot;&quot;,
</span><span class="cx">                     &quot;Topic&quot; : &quot;&quot;,
</span><span class="cx">                 },
</span><span class="lines">@@ -1221,6 +1221,12 @@
</span><span class="cx">     (&quot;ConfigRoot&quot;, (&quot;Scheduling&quot;, &quot;iSchedule&quot;, &quot;DKIM&quot;, &quot;PublicKeyFile&quot;,)),
</span><span class="cx">     (&quot;ConfigRoot&quot;, (&quot;Scheduling&quot;, &quot;iSchedule&quot;, &quot;DKIM&quot;, &quot;PrivateExchanges&quot;,)),
</span><span class="cx">     (&quot;ConfigRoot&quot;, &quot;WritableConfigFile&quot;),
</span><ins>+    (&quot;ConfigRoot&quot;, (&quot;Notifications&quot;, &quot;Services&quot;, &quot;APNS&quot;, &quot;CalDAV&quot;, &quot;AuthorityChainPath&quot;,)),
+    (&quot;ConfigRoot&quot;, (&quot;Notifications&quot;, &quot;Services&quot;, &quot;APNS&quot;, &quot;CalDAV&quot;, &quot;CertificatePath&quot;,)),
+    (&quot;ConfigRoot&quot;, (&quot;Notifications&quot;, &quot;Services&quot;, &quot;APNS&quot;, &quot;CalDAV&quot;, &quot;PrivateKeyPath&quot;,)),
+    (&quot;ConfigRoot&quot;, (&quot;Notifications&quot;, &quot;Services&quot;, &quot;APNS&quot;, &quot;CardDAV&quot;, &quot;AuthorityChainPath&quot;,)),
+    (&quot;ConfigRoot&quot;, (&quot;Notifications&quot;, &quot;Services&quot;, &quot;APNS&quot;, &quot;CardDAV&quot;, &quot;CertificatePath&quot;,)),
+    (&quot;ConfigRoot&quot;, (&quot;Notifications&quot;, &quot;Services&quot;, &quot;APNS&quot;, &quot;CardDAV&quot;, &quot;PrivateKeyPath&quot;,)),
</ins><span class="cx">     (&quot;LogRoot&quot;, &quot;AccessLogFile&quot;),
</span><span class="cx">     (&quot;LogRoot&quot;, &quot;ErrorLogFile&quot;),
</span><span class="cx">     (&quot;LogRoot&quot;, &quot;AgentLogFile&quot;),
</span></span></pre>
</div>
</div>

</body>
</html>