<!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>[12431] 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/12431">12431</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 10:57:47 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate data+config+logs under OS X Server</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="#CalendarServertrunkconfcaldavdappleplist">CalendarServer/trunk/conf/caldavd-apple.plist</a></li>
<li><a href="#CalendarServertrunkcontriblaunchdcalendarserverplist">CalendarServer/trunk/contrib/launchd/calendarserver.plist</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 (12430 => 12431)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/config.py 2014-01-23 03:26:38 UTC (rev 12430)
+++ CalendarServer/trunk/calendarserver/tools/config.py 2014-01-23 18:57:47 UTC (rev 12431)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> "Authentication.Kerberos.AllowedOverWireUnencrypted",
</span><span class="cx"> "Authentication.Kerberos.Enabled",
</span><span class="cx"> "Authentication.Wiki.Enabled",
</span><del>- "DataRoot",
</del><span class="cx"> "DefaultLogLevel",
</span><span class="cx"> "DirectoryAddressBook.params.queryPeopleRecords",
</span><span class="cx"> "DirectoryAddressBook.params.queryUserRecords",
</span><span class="lines">@@ -75,6 +74,7 @@
</span><span class="cx"> "SSLPrivateKey",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def usage(e=None):
</span><span class="cx"> if e:
</span><span class="cx"> print(e)
</span><span class="lines">@@ -482,9 +482,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def respond(command, result):
</span><del>- sys.stdout.write(writePlistToString({'command' : command['command'], 'result' : result}))
</del><ins>+ sys.stdout.write(writePlistToString({'command': command['command'], 'result': result}))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def respondWithError(msg, status=1):
</span><del>- sys.stdout.write(writePlistToString({'error' : msg, }))
</del><ins>+ sys.stdout.write(writePlistToString({'error': msg, }))
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_configpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_config.py (12430 => 12431)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_config.py 2014-01-23 03:26:38 UTC (rev 12430)
+++ CalendarServer/trunk/calendarserver/tools/test/test_config.py 2014-01-23 18:57:47 UTC (rev 12431)
</span><span class="lines">@@ -148,8 +148,8 @@
</span><span class="cx"> self.assertEquals(results["result"]["EnableSSL"], True)
</span><span class="cx"> self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], True)
</span><span class="cx"> self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/changed.cer")
</span><del>- dataRoot = "Data/%s/%s" % (unichr(208), u"\ud83d\udca3")
- self.assertTrue(results["result"]["DataRoot"].endswith(dataRoot))
</del><ins>+ hostName = "hostname_%s_%s" % (unichr(208), u"\ud83d\udca3")
+ self.assertTrue(results["result"]["ServerHostName"].endswith(hostName))
</ins><span class="cx">
</span><span class="cx"> # The static plist should still have EnableCalDAV = True
</span><span class="cx"> staticPlist = plistlib.readPlist(self.configFileName)
</span><span class="lines">@@ -237,8 +237,8 @@
</span><span class="cx"> <true/>
</span><span class="cx"> <key>Notifications.Services.APNS.CalDAV.CertificatePath</key>
</span><span class="cx"> <string>/example/changed.cer</string>
</span><del>- <key>DataRoot</key>
- <string>Data/%s/%s</string>
</del><ins>+ <key>ServerHostName</key>
+ <string>hostname_%s_%s</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_gatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py (12430 => 12431)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2014-01-23 03:26:38 UTC (rev 12430)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2014-01-23 18:57:47 UTC (rev 12431)
</span><span class="lines">@@ -369,8 +369,8 @@
</span><span class="cx"> self.assertEquals(results["result"]["EnableSSL"], True)
</span><span class="cx"> self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["Enabled"], True)
</span><span class="cx"> self.assertEquals(results["result"]["Notifications"]["Services"]["APNS"]["CalDAV"]["CertificatePath"], "/example/changed.cer")
</span><del>- dataRoot = "Data/%s/%s" % (unichr(208), u"\ud83d\udca3")
- self.assertTrue(results["result"]["DataRoot"].endswith(dataRoot))
</del><ins>+ hostName = "hostname_%s_%s" % (unichr(208), u"\ud83d\udca3")
+ self.assertTrue(results["result"]["ServerHostName"].endswith(hostName))
</ins><span class="cx">
</span><span class="cx"> # The static plist should still have EnableCalDAV = True
</span><span class="cx"> staticPlist = plistlib.readPlist(self.configFileName)
</span><span class="lines">@@ -807,8 +807,8 @@
</span><span class="cx"> <true/>
</span><span class="cx"> <key>Notifications.Services.APNS.CalDAV.CertificatePath</key>
</span><span class="cx"> <string>/example/changed.cer</string>
</span><del>- <key>DataRoot</key>
- <string>Data/%s/%s</string>
</del><ins>+ <key>ServerHostName</key>
+ <string>hostname_%s_%s</string>
</ins><span class="cx"> </dict>
</span><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-apple.plist (12430 => 12431)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-apple.plist 2014-01-23 03:26:38 UTC (rev 12430)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2014-01-23 18:57:47 UTC (rev 12431)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- Log root -->
</span><span class="cx"> <key>LogRoot</key>
</span><del>- <string>/var/log/caldavd</string>
</del><ins>+ <string>Logs</string>
</ins><span class="cx">
</span><span class="cx"> <!-- Apache-style access log -->
</span><span class="cx"> <key>AccessLogFile</key>
</span><span class="lines">@@ -542,11 +542,13 @@
</span><span class="cx">
</span><span class="cx"> <key>Includes</key>
</span><span class="cx"> <array>
</span><del>- <string>/Library/Server/Calendar and Contacts/Config/caldavd-system.plist</string>
- <string>/Library/Server/Calendar and Contacts/Config/caldavd-user.plist</string>
</del><ins>+ <string>/Library/Preferences/com.apple.servermgr_calendar.plist</string>
+ <string>caldavd-system.plist</string>
+ <string>caldavd-user.plist</string>
</ins><span class="cx"> </array>
</span><ins>+
</ins><span class="cx"> <key>WritableConfigFile</key>
</span><del>- <string>/Library/Server/Calendar and Contacts/Config/caldavd-system.plist</string>
</del><ins>+ <string>caldavd-system.plist</string>
</ins><span class="cx">
</span><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="CalendarServertrunkcontriblaunchdcalendarserverplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/launchd/calendarserver.plist (12430 => 12431)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/launchd/calendarserver.plist 2014-01-23 03:26:38 UTC (rev 12430)
+++ CalendarServer/trunk/contrib/launchd/calendarserver.plist 2014-01-23 18:57:47 UTC (rev 12431)
</span><span class="lines">@@ -64,10 +64,10 @@
</span><span class="cx"> <true/>
</span><span class="cx">
</span><span class="cx"> <key>StandardOutPath</key>
</span><del>- <string>/var/log/caldavd/error.log</string>
</del><ins>+ <string>/Library/Server/Logs/caldavd.log</string>
</ins><span class="cx">
</span><span class="cx"> <key>StandardErrorPath</key>
</span><del>- <string>/var/log/caldavd/error.log</string>
</del><ins>+ <string>/Library/Server/Logs/caldavd.log</string>
</ins><span class="cx">
</span><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (12430 => 12431)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-01-23 03:26:38 UTC (rev 12430)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-01-23 18:57:47 UTC (rev 12431)
</span><span class="lines">@@ -1035,11 +1035,21 @@
</span><span class="cx"> # means no automatic shutdown.
</span><span class="cx"> "AgentInactivityTimeoutSeconds" : 4 * 60 * 60,
</span><span class="cx">
</span><del>- # These aren't relative to ConfigRoot:
- "ImportConfig": "", # Config to read first and merge
- "Includes": [], # Other plists to parse after this one
- "WritableConfigFile" : "", # which config file calendarserver_config should
- # write to for changes; empty string means the main config file.
</del><ins>+
+ # These three keys are relative to ConfigRoot:
+
+ # Config to read first and merge
+ "ImportConfig": "",
+
+ # Other plists to parse after this one; note that an Include can change
+ # the ServerRoot and/or ConfigRoot, thereby affecting the locations of
+ # the following Includes in the list. (Useful for service directory
+ # relocation)
+ "Includes": [],
+
+ # Which config file calendarserver_config should write to for changes;
+ # empty string means the main config file
+ "WritableConfigFile": "",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1091,9 +1101,11 @@
</span><span class="cx"> def _loadIncludes(parentDict):
</span><span class="cx"> # Now check for Includes and parse and add each of those
</span><span class="cx"> if "Includes" in parentDict:
</span><del>- configRoot = os.path.join(parentDict.ServerRoot, parentDict.ConfigRoot)
</del><span class="cx"> for include in parentDict.Includes:
</span><del>- # Includes are not relative to ConfigRoot
</del><ins>+ # Recompute this because ServerRoot and ConfigRoot
+ # could change when including another file
+ configRoot = os.path.join(parentDict.ServerRoot,
+ parentDict.ConfigRoot)
</ins><span class="cx"> path = _expandPath(fullServerPath(configRoot, include))
</span><span class="cx"> if os.path.exists(path):
</span><span class="cx"> additionalDict = ConfigDict(self._parseConfigFromFile(path))
</span><span class="lines">@@ -1145,6 +1157,7 @@
</span><span class="cx"> ("ConfigRoot", ("Scheduling", "iSchedule", "DKIM", "PrivateKeyFile",)),
</span><span class="cx"> ("ConfigRoot", ("Scheduling", "iSchedule", "DKIM", "PublicKeyFile",)),
</span><span class="cx"> ("ConfigRoot", ("Scheduling", "iSchedule", "DKIM", "PrivateExchanges",)),
</span><ins>+ ("ConfigRoot", "WritableConfigFile"),
</ins><span class="cx"> ("LogRoot", "AccessLogFile"),
</span><span class="cx"> ("LogRoot", "ErrorLogFile"),
</span><span class="cx"> ("LogRoot", "AgentLogFile"),
</span></span></pre>
</div>
</div>
</body>
</html>