[CalendarServer-changes] [6272] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Sep 10 12:50:29 PDT 2010
Revision: 6272
http://trac.macosforge.org/projects/calendarserver/changeset/6272
Author: wsanchez at apple.com
Date: 2010-09-10 12:50:28 -0700 (Fri, 10 Sep 2010)
Log Message:
-----------
Move default server root to /var/db/caldavd.
Change Mac OS default from /Library/CalendarServer/ to /Library/Server/Calendar and Contacts/.
Modified Paths:
--------------
CalendarServer/trunk/conf/caldavd-apple.plist
CalendarServer/trunk/conf/caldavd.plist
CalendarServer/trunk/doc/caldavd.8
CalendarServer/trunk/support/Makefile.Apple
CalendarServer/trunk/twistedcaldav/stdconfig.py
Removed Paths:
-------------
CalendarServer/trunk/conf/carddavd-apple.plist
CalendarServer/trunk/conf/carddavd-test.plist
CalendarServer/trunk/conf/carddavd.plist
Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/conf/caldavd-apple.plist 2010-09-10 19:50:28 UTC (rev 6272)
@@ -92,7 +92,7 @@
<!-- Server root -->
<key>ServerRoot</key>
- <string>/Library/CalendarServer</string>
+ <string>/Library/Server/Calendar and Contacts</string>
<!-- Data root -->
<key>DataRoot</key>
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/conf/caldavd.plist 2010-09-10 19:50:28 UTC (rev 6272)
@@ -78,7 +78,7 @@
<!-- Server root -->
<key>ServerRoot</key>
- <string>/Library/CalendarServer</string>
+ <string>/var/db/caldavd</string>
<!-- Data root -->
<key>DataRoot</key>
Deleted: CalendarServer/trunk/conf/carddavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd-apple.plist 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/conf/carddavd-apple.plist 2010-09-10 19:50:28 UTC (rev 6272)
@@ -1,643 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
-
- <!--
- Public network address information
-
- This is the server's public network address, which is provided to
- clients in URLs and the like. It may or may not be the network
- address that the server is listening to directly, though it is by
- default. For example, it may be the address of a load balancer or
- proxy which forwards connections to the server.
- -->
-
- <!-- Network host name [empty = system host name] -->
- <key>ServerHostName</key>
- <string></string> <!-- The hostname clients use when connecting -->
-
- <key>EnableCardDAV</key>
- <true/>
-
- <key>EnableCalDAV</key>
- <false/>
-
- <key>ControlSocket</key>
- <string>carddavd.sock</string>
-
- <!-- HTTP port [0 = disable HTTP] -->
- <key>HTTPPort</key>
- <integer>8800</integer>
-
- <!-- SSL port [0 = disable HTTPS] -->
- <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
- <!--
- <key>SSLPort</key>
- <integer>8443</integer>
- -->
-
- <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
- <key>RedirectHTTPToHTTPS</key>
- <false/>
-
-
- <!--
- Network address configuration information
-
- This configures the actual network address that the server binds to.
- -->
-
- <!-- List of IP addresses to bind to [empty = all] -->
- <key>BindAddresses</key>
- <array>
- </array>
-
- <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
- <key>BindHTTPPorts</key>
- <array>
- </array>
-
- <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
- <key>BindSSLPorts</key>
- <array>
- </array>
-
-
- <!--
- Data Store
- -->
-
- <!-- Server root -->
- <key>ServerRoot</key>
- <string>/Library/CalendarServer</string>
-
- <!-- Data root -->
- <key>DataRoot</key>
- <string>Data</string>
-
- <!-- Database root -->
- <key>DatabaseRoot</key>
- <string>AddressbookDatabase</string>
-
- <!-- Document root -->
- <key>DocumentRoot</key>
- <string>Documents</string>
-
- <!-- Configuration root -->
- <key>ConfigRoot</key>
- <string>/etc/carddavd</string>
-
- <!-- Run root -->
- <key>RunRoot</key>
- <string>/var/run</string>
-
- <!-- Child aliases -->
- <key>Aliases</key>
- <dict>
- <!--
- <key>foo</key>
- <dict>
- <key>path</key>
- <string>/path/to/foo</string>
- </dict>
- -->
- </dict>
-
-
- <!--
- Quotas and limits
- -->
-
- <!-- User quota (in bytes) [0 = no quota] -->
- <key>UserQuota</key>
- <integer>104857600</integer><!-- 100Mb -->
-
- <!-- Attachment size limit (in bytes) -->
- <key>MaximumAttachmentSize</key>
- <integer>1048576</integer><!-- 1Mb -->
-
- <!-- Maximum number of unique attendees per entire event -->
- <!-- 0 for no limit -->
- <key>MaxAttendeesPerInstance</key>
- <integer>100</integer>
-
- <!-- Maximum number of instances allowed for a single RRULE -->
- <!-- 0 for no limit -->
- <key>MaxInstancesForRRULE</key>
- <integer>400</integer>
-
-
- <!--
- Directory service
-
- A directory service provides information about principals (eg.
- users, groups, locations and resources) to the server.
-
- A variety of directory services are available for use.
- -->
-
- <!-- Disable resource service. -->
- <key>ResourceService</key>
- <dict>
- <key>Enabled</key>
- <false/>
- </dict>
-
- <!-- XML File Directory Service -->
- <!--
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>xmlFile</key>
- <string>accounts.xml</string>
- </dict>
- </dict>
- -->
-
- <!-- Open Directory Service (Mac OS X) -->
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
-
-
- <!--
- Special principals
-
- These principals are granted special access and/or perform
- special roles on the server.
- -->
-
- <!-- Principals with "DAV:all" access (relative URLs) -->
- <key>AdminPrincipals</key>
- <array>
- <!-- <string>/principals/__uids__/AEB68DD7-D2B8-4D4D-A574-2A4533DF36A4/</string> -->
- </array>
-
- <!-- Principals with "DAV:read" access (relative URLs) -->
- <key>ReadPrincipals</key>
- <array>
- <!-- <string>/principals/__uids__/983C8238-FB6B-4D92-9242-89C0A39E5F81/</string> -->
- </array>
-
- <!-- Create "proxy access" principals -->
- <key>EnableProxyPrincipals</key>
- <true/>
-
-
- <!--
- Permissions
- -->
-
- <!-- Anonymous read access for root resource -->
- <key>EnableAnonymousReadRoot</key>
- <false/>
-
- <!-- Anonymous read access for resource hierarchy -->
- <key>EnableAnonymousReadNav</key>
- <false/>
-
- <!-- Enables directory listings for principals -->
- <key>EnablePrincipalListings</key>
- <false/>
-
- <!-- Render calendar collections as a monolithic iCalendar object -->
- <key>EnableMonolithicCalendars</key>
- <true/>
-
-
- <!--
- Authentication
- -->
-
- <key>Authentication</key>
- <dict>
-
- <!-- Clear text; best avoided -->
- <key>Basic</key>
- <dict>
- <key>Enabled</key>
- <false/>
- </dict>
-
- <!-- Digest challenge/response -->
- <key>Digest</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>Algorithm</key>
- <string>md5</string>
- <key>Qop</key>
- <string></string>
- </dict>
-
- <!-- Kerberos/SPNEGO -->
- <key>Kerberos</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>ServicePrincipal</key>
- <string></string>
- </dict>
-
- <!-- Wikiserver authentication (Mac OS X) -->
- <key>Wiki</key>
- <dict>
- <key>Enabled</key>
- <true/>
- </dict>
-
- </dict>
-
-
- <!--
- Logging
- -->
-
- <!-- Log root -->
- <key>LogRoot</key>
- <string>/var/log/carddavd</string>
-
- <!-- Apache-style access log -->
- <key>AccessLogFile</key>
- <string>access.log</string>
- <key>RotateAccessLog</key>
- <true/>
-
- <!-- Server activity log -->
- <key>ErrorLogFile</key>
- <string>error.log</string>
-
- <!-- Log levels -->
- <key>DefaultLogLevel</key>
- <string>warn</string> <!-- debug, info, warn, error -->
-
- <!-- Global server stats -->
- <key>GlobalStatsSocket</key>
- <string>carddavd-stats.sock</string>
-
- <!-- Server process ID file -->
- <key>PIDFile</key>
- <string>carddavd.pid</string>
-
-
- <!--
- SSL/TLS
- -->
-
- <!-- Public key -->
- <key>SSLCertificate</key>
- <string></string>
-
- <!-- SSL authority chain (for intermediate certs) -->
- <key>SSLAuthorityChain</key>
- <string></string>
-
- <!-- Private key -->
- <key>SSLPrivateKey</key>
- <string></string>
-
-
- <!--
- Process management
- -->
-
- <key>UserName</key>
- <string>calendar</string>
-
- <key>GroupName</key>
- <string>calendar</string>
-
- <key>ProcessType</key>
- <string>Combined</string>
-
- <key>MultiProcess</key>
- <dict>
- <key>ProcessCount</key>
- <integer>0</integer> <!-- 0 = larger of: 4 or (2 * CPU count) -->
- </dict>
-
- <key>Memcached</key>
- <dict>
- <key>Pools</key>
- <dict>
- <key>Default</key>
- <dict>
- <key>Port</key>
- <integer>11212</integer>
- </dict>
- </dict>
- </dict>
-
- <!--
- Notifications
- -->
-
- <key>Notifications</key>
- <dict>
- <!-- Time spent coalescing notifications before delivery -->
- <key>CoalesceSeconds</key>
- <integer>3</integer>
-
- <!-- Client service port different from caldav -->
- <key>InternalNotificationPort</key>
- <integer>62311</integer>
-
- <key>Services</key>
- <dict>
- <key>XMPPNotifier</key>
- <dict>
- <!-- XMPP notification service -->
- <key>Service</key>
- <string>twistedcaldav.notify.XMPPNotifierService</string>
- <key>Enabled</key>
- <false/>
-
- <!-- XMPP host and port to contact -->
- <key>Host</key>
- <string>xmpp.host.name</string>
- <key>Port</key>
- <integer>5222</integer>
-
- <!-- Jabber ID and password for the server -->
- <key>JID</key>
- <string>jid at xmpp.host.name/resource</string>
- <key>Password</key>
- <string>password_goes_here</string>
-
- <!-- PubSub service address -->
- <key>ServiceAddress</key>
- <string>pubsub.xmpp.host.name</string>
- </dict>
- </dict>
- </dict>
-
-
- <!--
- Server-to-server protocol
- -->
-
- <key>Scheduling</key>
- <dict>
-
- <!-- CalDAV protocol options -->
- <key>CalDAV</key>
- <dict>
- <key>EmailDomain</key>
- <string></string>
- <key>HTTPDomain</key>
- <string></string>
- <key>AddressPatterns</key>
- <array>
- </array>
- </dict>
-
- <!-- iSchedule protocol options -->
- <key>iSchedule</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>AddressPatterns</key>
- <array>
- </array>
- <key>Servers</key>
- <string>servertoserver.xml</string>
- </dict>
-
- <!-- iMIP protocol options -->
- <key>iMIP</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>MailGatewayServer</key>
- <string>localhost</string>
- <key>MailGatewayPort</key>
- <integer>62310</integer>
- <key>Sending</key>
- <dict>
- <key>Server</key>
- <string></string>
- <key>Port</key>
- <integer>587</integer>
- <key>UseSSL</key>
- <true/>
- <key>Username</key>
- <string></string>
- <key>Password</key>
- <string></string>
- <key>Address</key>
- <string></string> <!-- Address email will be sent from -->
- </dict>
- <key>Receiving</key>
- <dict>
- <key>Server</key>
- <string></string>
- <key>Port</key>
- <integer>995</integer>
- <key>Type</key>
- <string></string> <!-- Either "pop" or "imap" -->
- <key>UseSSL</key>
- <true/>
- <key>Username</key>
- <string></string>
- <key>Password</key>
- <string></string>
- <key>PollingSeconds</key>
- <integer>30</integer>
- </dict>
- <key>AddressPatterns</key>
- <array>
- <string>mailto:.*</string>
- </array>
- </dict>
-
- </dict>
-
-
- <!--
- Free-busy URL protocol
- -->
-
- <key>FreeBusyURL</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>TimePeriod</key>
- <integer>14</integer>
- <key>AnonymousAccess</key>
- <false/>
- </dict>
-
-
- <!--
- Non-standard CalDAV extensions
- -->
-
- <!-- Calendar Drop Box -->
- <key>EnableDropBox</key>
- <false/>
-
- <!-- Private Events -->
- <key>EnablePrivateEvents</key>
- <false/>
-
- <!-- Timezone Service -->
- <key>EnableTimezoneService</key>
- <false/>
-
-
- <!--
- Miscellaneous items
- -->
-
- <!-- Service ACLs (Mac OS X) -->
- <key>EnableSACLs</key>
- <true/>
-
- <!-- Web-based administration -->
- <key>EnableWebAdmin</key>
- <true/>
-
- <key>DirectoryAddressBook</key>
- <dict>
- <key>Enabled</key>
- <true/>
-
- <key>type</key>
- <string>twistedcaldav.directory.opendirectorybacker.OpenDirectoryBackingService</string>
-
- <key>params</key>
- <dict>
- <!-- Search for people records -->
- <key>queryPeopleRecords</key>
- <true/>
- <!-- Search for people records in this directory service node -->
- <key>peopleNode</key>
- <string>/Search/Contacts</string>
- <!-- Search for user records -->
- <key>queryUserRecords</key>
- <true/>
- <key>userNode</key>
- <!-- Search for user records in this directory service node -->
- <string>/Search/Contacts</string>
- <!-- query in directory service local node -->
- <key>queryDSLocal</key>
- <false/>
- <!-- minutes to keep directory service local node in memory before refresh -->
- <key>dsLocalCacheTimeout</key>
- <integer>30</integer>
- <!-- approx. maximum number of records returned from a directory service query -->
- <key>maxDSQueryRecords</key>
- <integer>0</integer> <!-- use 0 to have server calculate the maximum based on MaxAddressBookQueryResults, MaxAddressBookMultigetHrefs keys -->
- <!-- ignore system records like "root" when creating vCards -->
- <key>ignoreSystemRecords</key>
- <true/>
- <!-- True to use a directory service query for each addressBook-query to the directory address book -->
- <key>liveQuery</key>
- <true/>
- <!-- fake the eTag. If false all directory service attributes are used to calculate the eTag -->
- <key>fakeETag</key>
- <true/>
- <!-- True to store the results on disk after a directory service query. True is usually much slower. -->
- <key>cacheQuery</key>
- <false/>
- <!-- If cacheQuery is True and liveQuery is False, the minutes to keep the results from a complete directory service all record query. -->
- <key>cacheTimeout</key>
- <integer>30</integer>
- <!-- add this key to use additional directory service attributes in queries. Needed for some queries with directory service templates.
- <key>additionalAttributes</key>
- <array>
- <string>dsAttrTypeNative:sampleAIMPreferred</string>
- <string>dsAttrTypeNative:sampleManager</string>
- </array>
- -->
- <!-- add this key to limit directory service attributes used to make vCard properties
- When using directory service templates, list should include only mapped attributes.
- <key>allowedAttributes</key>
- <array>
- <string>dsAttrTypeStandard:AddressLine1</string>
- <string>dsAttrTypeStandard:AddressLine2</string>
- <string>dsAttrTypeStandard:AddressLine3</string>
- <string>dsAttrTypeStandard:Birthday</string>
- <string>dsAttrTypeStandard:Building</string>
- <string>dsAttrTypeStandard:City</string>
- <string>dsAttrTypeStandard:Comment</string>
- <string>dsAttrTypeStandard:Company</string>
- <string>dsAttrTypeStandard:Country</string>
- <string>dsAttrTypeStandard:CreationTimestamp</string>
- <string>dsAttrTypeStandard:Department</string>
- <string>dsAttrTypeStandard:EMailAddress</string>
- <string>dsAttrTypeStandard:EMailContacts</string>
- <string>dsAttrTypeStandard:FAXNumber</string>
- <string>dsAttrTypeStandard:FirstName</string>
- <string>dsAttrTypeStandard:HomePhoneNumber</string>
- <string>dsAttrTypeStandard:IMHandle</string>
- <string>dsAttrTypeStandard:JPEGPhoto</string>
- <string>dsAttrTypeStandard:JobTitle</string>
- <string>dsAttrTypeStandard:LastName</string>
- <string>dsAttrTypeStandard:MapCoordinates</string>
- <string>dsAttrTypeStandard:MiddleName</string>
- <string>dsAttrTypeStandard:MobileNumber</string>
- <string>dsAttrTypeStandard:ModificationTimestamp</string>
- <string>dsAttrTypeStandard:NamePrefix</string>
- <string>dsAttrTypeStandard:NameSuffix</string>
- <string>dsAttrTypeStandard:NickName</string>
- <string>dsAttrTypeStandard:Note</string>
- <string>dsAttrTypeStandard:OrganizationName</string>
- <string>dsAttrTypeStandard:PGPPublicKey</string>
- <string>dsAttrTypeStandard:PagerNumber</string>
- <string>dsAttrTypeStandard:PhoneContacts</string>
- <string>dsAttrTypeStandard:PhoneNumber</string>
- <string>dsAttrTypeStandard:PostalAddress</string>
- <string>dsAttrTypeStandard:PostalAddressContacts</string>
- <string>dsAttrTypeStandard:PostalCode</string>
- <string>dsAttrTypeStandard:Relationships</string>
- <string>dsAttrTypeStandard:State</string>
- <string>dsAttrTypeStandard:Street</string>
- <string>dsAttrTypeStandard:URL</string>
- <string>dsAttrTypeStandard:UserCertificate</string>
- <string>dsAttrTypeStandard:UserPKCS12Data</string>
- <string>dsAttrTypeStandard:UserSMIMECertificate</string>
- <string>dsAttrTypeStandard:WeblogURI</string>
- </array>
- -->
- </dict>
- </dict>
-
- <!-- allow unauthenticated users to access the directory address book -->
- <key>AnonymousDirectoryAddressBookAccess</key>
- <false/>
-
- </dict>
-</plist>
Deleted: CalendarServer/trunk/conf/carddavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd-test.plist 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/conf/carddavd-test.plist 2010-09-10 19:50:28 UTC (rev 6272)
@@ -1,804 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
-
- <!--
- Public network address information
-
- This is the server's public network address, which is provided to
- clients in URLs and the like. It may or may not be the network
- address that the server is listening to directly, though it is by
- default. For example, it may be the address of a load balancer or
- proxy which forwards connections to the server.
- -->
-
- <!-- Network host name [empty = system host name] -->
- <key>ServerHostName</key>
- <string></string> <!-- The hostname clients use when connecting -->
-
- <key>EnableCalDAV</key>
- <false/>
-
- <key>EnableCardDAV</key>
- <true/>
-
- <!-- HTTP port [0 = disable HTTP] -->
- <key>HTTPPort</key>
- <integer>8800</integer>
-
- <!-- SSL port [0 = disable HTTPS] -->
- <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
- <key>SSLPort</key>
- <integer>8843</integer>
-
- <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
- <key>RedirectHTTPToHTTPS</key>
- <false/>
-
-
- <!--
- Network address configuration information
-
- This configures the actual network address that the server binds to.
- -->
-
- <!-- List of IP addresses to bind to [empty = all] -->
- <key>BindAddresses</key>
- <array>
- </array>
-
- <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
- <key>BindHTTPPorts</key>
- <array>
- </array>
-
- <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
- <key>BindSSLPorts</key>
- <array>
- </array>
-
-
- <!--
- Data Store
- -->
-
- <!-- Server root -->
- <key>ServerRoot</key>
- <string>./data</string>
-
- <!-- Data root -->
- <key>DataRoot</key>
- <string>Data</string>
-
- <!-- Document root -->
- <key>DocumentRoot</key>
- <string>Documents</string>
-
- <!-- Configuration root -->
- <key>ConfigRoot</key>
- <string>./conf</string>
-
- <!-- Run root -->
- <key>RunRoot</key>
- <string>Logs</string>
-
- <!-- Child aliases -->
- <key>Aliases</key>
- <dict>
- <!--
- <key>foo</key>
- <dict>
- <key>path</key>
- <string>/path/to/foo</string>
- </dict>
- -->
- </dict>
-
-
- <!--
- Quotas and limits
- -->
-
- <!-- User quota (in bytes) [0 = no quota] -->
- <key>UserQuota</key>
- <integer>104857600</integer><!-- 100Mb -->
-
- <!-- Attachment size limit (in bytes) -->
- <key>MaximumAttachmentSize</key>
- <integer>1048576</integer><!-- 1Mb -->
-
- <!-- Maximum number of unique attendees per entire event -->
- <!-- 0 for no limit -->
- <key>MaxAttendeesPerInstance</key>
- <integer>100</integer>
-
- <!-- Maximum number of instances allowed for a single RRULE -->
- <!-- 0 for no limit -->
- <key>MaxInstancesForRRULE</key>
- <integer>400</integer>
-
-
- <!--
- Directory service
-
- A directory service provides information about principals (eg.
- users, groups, locations and resources) to the server.
-
- A variety of directory services are available for use.
- -->
-
- <!-- XML File Directory Service -->
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>xmlFile</key>
- <string>./conf/auth/accounts-test.xml</string>
- </dict>
- </dict>
-
- <!-- Open Directory Service (Mac OS X) -->
- <!--
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
-
- <!-- Resource and Location Service -->
- <key>ResourceService</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>type</key>
- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>xmlFile</key>
- <string>./conf/auth/resources-test.xml</string>
- </dict>
- </dict>
-
- <!-- XML File Augment Service -->
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentXMLDB</string>
-
- <key>params</key>
- <dict>
- <key>xmlFiles</key>
- <array>
- <string>./conf/auth/augments-test.xml</string>
- </array>
- </dict>
- </dict>
-
- <!-- Sqlite Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentSqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>./conf/auth/augments.sqlite</string>
- </dict>
- </dict>
- -->
-
- <!-- PostgreSQL Augment Service -->
- <!--
- <key>AugmentService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.augment.AugmentPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>augments</string>
- </dict>
- </dict>
- -->
-
- <!-- Sqlite ProxyDB Service -->
- <key>ProxyDBService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.calendaruserproxy.ProxySqliteDB</string>
-
- <key>params</key>
- <dict>
- <key>dbpath</key>
- <string>proxies.sqlite</string>
- </dict>
- </dict>
-
- <!-- PostgreSQL ProxyDB Service -->
- <!--
- <key>ProxyDBService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.calendaruserproxy.ProxyPostgreSQLDB</string>
-
- <key>params</key>
- <dict>
- <key>host</key>
- <string>localhost</string>
- <key>database</key>
- <string>proxies</string>
- </dict>
- </dict>
- -->
-
- <key>ProxyLoadFromFile</key>
- <string>./conf/auth/proxies-test.xml</string>
-
-
- <!--
- Special principals
-
- These principals are granted special access and/or perform
- special roles on the server.
- -->
-
- <!-- Principals with "DAV:all" access (relative URLs) -->
- <key>AdminPrincipals</key>
- <array>
- <string>/principals/__uids__/admin/</string>
- </array>
-
- <!-- Principals with "DAV:read" access (relative URLs) -->
- <key>ReadPrincipals</key>
- <array>
- <!-- <string>/principals/__uids__/983C8238-FB6B-4D92-9242-89C0A39E5F81/</string> -->
- </array>
-
- <!-- Principals that can pose as other principals -->
- <key>SudoersFile</key>
- <string>sudoers.plist</string>
-
- <!-- Create "proxy access" principals -->
- <key>EnableProxyPrincipals</key>
- <true/>
-
-
- <!--
- Permissions
- -->
-
- <!-- Anonymous read access for root resource -->
- <key>EnableAnonymousReadRoot</key>
- <!-- Note: this _must_ be false if EnableCardDAV is true: some CardDAV
- clients require a 403 at / to establish authentication. -->
- <false/>
-
- <!-- Anonymous read access for resource hierarchy -->
- <key>EnableAnonymousReadNav</key>
- <false/>
-
- <!-- Enables directory listings for principals -->
- <key>EnablePrincipalListings</key>
- <true/>
-
- <!-- Render calendar collections as a monolithic iCalendar object -->
- <key>EnableMonolithicCalendars</key>
- <true/>
-
-
- <!--
- Authentication
- -->
-
- <key>Authentication</key>
- <dict>
-
- <!-- Clear text; best avoided -->
- <key>Basic</key>
- <dict>
- <key>Enabled</key>
- <true/>
- </dict>
-
- <!-- Digest challenge/response -->
- <key>Digest</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>Algorithm</key>
- <string>md5</string>
- <key>Qop</key>
- <string></string>
- </dict>
-
- <!-- Kerberos/SPNEGO -->
- <key>Kerberos</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>ServicePrincipal</key>
- <string></string>
- </dict>
-
- <!-- Wikiserver authentication (Mac OS X) -->
- <key>Wiki</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>Cookie</key>
- <string>sessionID</string>
- <key>URL</key>
- <string>http://127.0.0.1/RPC2</string>
- <key>UserMethod</key>
- <string>userForSession</string>
- <key>WikiMethod</key>
- <string>accessLevelForUserWikiCalendar</string>
- </dict>
-
- </dict>
-
-
- <!--
- Logging
- -->
-
- <!-- Log root -->
- <key>LogRoot</key>
- <string>Logs</string>
-
- <!-- Apache-style access log -->
- <key>AccessLogFile</key>
- <string>access.log</string>
- <key>RotateAccessLog</key>
- <false/>
-
- <!-- Server activity log -->
- <key>ErrorLogFile</key>
- <string>error.log</string>
-
- <!-- Log levels -->
- <key>DefaultLogLevel</key>
- <string>info</string> <!-- debug, info, warn, error -->
-
- <!-- Log level overrides for specific functionality -->
- <key>LogLevels</key>
- <dict>
- <!--
- <key>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</key>
- <string>debug</string>
- -->
- </dict>
-
- <!-- Global server stats -->
- <key>GlobalStatsSocket</key>
- <string>carddavd-stats.sock</string>
-
- <!-- Global server stats logging period -->
- <key>GlobalStatsLoggingPeriod</key>
- <integer>60</integer>
-
- <!-- Global server stats logging frequency [0 = disable stats] -->
- <key>GlobalStatsLoggingFrequency</key>
- <integer>12</integer>
-
- <!-- Server statistics file -->
- <key>ServerStatsFile</key>
- <string>stats.plist</string>
-
- <!-- Server process ID file -->
- <key>PIDFile</key>
- <string>carddavd.pid</string>
-
-
- <!--
- Accounting
- -->
-
- <!-- Enable accounting for certain operations -->
- <key>AccountingCategories</key>
- <dict>
- <key>iTIP</key>
- <false/>
- <key>HTTP</key>
- <false/>
- </dict>
-
- <!-- Enable accounting for specific principals -->
- <key>AccountingPrincipals</key>
- <array>
- <!-- <string>/principals/__uids__/454D85C0-09F0-4DC6-A3C6-97DFEB4622CD/</string> -->
- </array>
-
-
- <!--
- SSL/TLS
- -->
-
- <!-- Public key -->
- <key>SSLCertificate</key>
- <string>twistedcaldav/test/data/server.pem</string>
-
- <!-- SSL authority chain (for intermediate certs) -->
- <key>SSLAuthorityChain</key>
- <string></string>
-
- <!-- Private key -->
- <key>SSLPrivateKey</key>
- <string>twistedcaldav/test/data/server.pem</string>
-
-
- <!--
- Process management
- -->
-
- <key>UserName</key>
- <string></string>
-
- <key>GroupName</key>
- <string></string>
-
- <key>ProcessType</key>
- <string>Combined</string>
-
- <key>MultiProcess</key>
- <dict>
- <key>ProcessCount</key>
- <integer>2</integer> <!-- 0 = larger of: 4 or (2 * CPU count) -->
- </dict>
-
-
- <!--
- Notifications
- -->
-
- <key>Notifications</key>
- <dict>
- <!-- Time spent coalescing notifications before delivery -->
- <key>CoalesceSeconds</key>
- <integer>3</integer>
-
- <key>InternalNotificationHost</key>
- <string>localhost</string>
-
- <key>InternalNotificationPort</key>
- <integer>62311</integer>
-
- <key>Services</key>
- <dict>
- <key>SimpleLineNotifier</key>
- <dict>
- <!-- Simple line notification service (for testing) -->
- <key>Service</key>
- <string>twistedcaldav.notify.SimpleLineNotifierService</string>
- <key>Enabled</key>
- <false/>
- <key>Port</key>
- <integer>62308</integer>
- </dict>
-
- <key>XMPPNotifier</key>
- <dict>
- <!-- XMPP notification service -->
- <key>Service</key>
- <string>twistedcaldav.notify.XMPPNotifierService</string>
- <key>Enabled</key>
- <false/>
-
- <!-- XMPP host and port to contact -->
- <key>Host</key>
- <string>xmpp.host.name</string>
- <key>Port</key>
- <integer>5222</integer>
-
- <!-- Jabber ID and password for the server -->
- <key>JID</key>
- <string>jid at xmpp.host.name/resource</string>
- <key>Password</key>
- <string>password_goes_here</string>
-
- <!-- PubSub service address -->
- <key>ServiceAddress</key>
- <string>pubsub.xmpp.host.name</string>
-
- <key>NodeConfiguration</key>
- <dict>
- <key>pubsub#deliver_payloads</key>
- <string>1</string>
- <key>pubsub#persist_items</key>
- <string>1</string>
- </dict>
-
- <!-- Sends a presence notification to XMPP server at this interval (prevents disconnect) -->
- <key>KeepAliveSeconds</key>
- <integer>120</integer>
-
- <!-- Sends a pubsub publish to a particular heartbeat node at this interval -->
- <key>HeartbeatMinutes</key>
- <integer>30</integer>
-
- <!-- List of glob-like expressions defining which XMPP JIDs can converse with the server (for debugging) -->
- <key>AllowedJIDs</key>
- <array>
- <!--
- <string>*.example.com</string>
- -->
- </array>
- </dict>
- </dict>
- </dict>
-
-
- <!--
- Server-to-server protocol
- -->
-
- <key>Scheduling</key>
- <dict>
-
- <!-- CalDAV protocol options -->
- <key>CalDAV</key>
- <dict>
- <key>EmailDomain</key>
- <string></string>
- <key>HTTPDomain</key>
- <string></string>
- <key>AddressPatterns</key>
- <array>
- </array>
- <key>OldDraftCompatibility</key>
- <true/>
- <key>ScheduleTagCompatibility</key>
- <true/>
- <key>EnablePrivateComments</key>
- <true/>
- </dict>
-
- <!-- iSchedule protocol options -->
- <key>iSchedule</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>AddressPatterns</key>
- <array>
- </array>
- <key>Servers</key>
- <string>servertoserver-test.xml</string>
- </dict>
-
- <!-- iMIP protocol options -->
- <key>iMIP</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>MailGatewayServer</key>
- <string>localhost</string>
- <key>MailGatewayPort</key>
- <integer>62310</integer>
- <key>Sending</key>
- <dict>
- <key>Server</key>
- <string></string>
- <key>Port</key>
- <integer>587</integer>
- <key>UseSSL</key>
- <true/>
- <key>Username</key>
- <string></string>
- <key>Password</key>
- <string></string>
- <key>Address</key>
- <string></string> <!-- Address email will be sent from -->
- </dict>
- <key>Receiving</key>
- <dict>
- <key>Server</key>
- <string></string>
- <key>Port</key>
- <integer>995</integer>
- <key>Type</key>
- <string></string> <!-- Either "pop" or "imap" -->
- <key>UseSSL</key>
- <true/>
- <key>Username</key>
- <string></string>
- <key>Password</key>
- <string></string>
- <key>PollingSeconds</key>
- <integer>30</integer>
- </dict>
- <key>AddressPatterns</key>
- <array>
- <string>mailto:.*</string>
- </array>
- </dict>
-
- <!-- General options for scheduling -->
- <key>Options</key>
- <dict>
- <key>AllowGroupAsOrganizer</key>
- <false/>
- <key>AllowLocationAsOrganizer</key>
- <false/>
- <key>AllowResourceAsOrganizer</key>
- <false/>
- </dict>
-
- </dict>
-
-
- <!--
- Free-busy URL protocol
- -->
-
- <key>FreeBusyURL</key>
- <dict>
- <key>Enabled</key>
- <false/>
- <key>TimePeriod</key>
- <integer>14</integer>
- <key>AnonymousAccess</key>
- <false/>
- </dict>
-
-
- <!--
- Non-standard CalDAV extensions
- -->
-
- <!-- Calendar Drop Box -->
- <key>EnableDropBox</key>
- <false/>
-
- <!-- Private Events -->
- <key>EnablePrivateEvents</key>
- <false/>
-
- <!-- Timezone Service -->
- <key>EnableTimezoneService</key>
- <false/>
-
- <!-- Shared Calendars & Address Books -->
- <key>Sharing</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>AllowExternalUsers</key>
- <false/>
- <key>Calendars</key>
- <dict>
- <key>Enabled</key>
- <false/>
- </dict>
- <key>AddressBooks</key>
- <dict>
- <key>Enabled</key>
- <true/>
- </dict>
- </dict>
-
- <!--
- Miscellaneous items
- -->
-
- <!-- Service ACLs (Mac OS X) -->
- <key>EnableSACLs</key>
- <false/>
-
- <!-- Web-based administration -->
- <key>EnableWebAdmin</key>
- <true/>
-
- <!-- Support for Content-Encoding compression options as specified in RFC2616 Section 3.5 -->
- <key>ResponseCompression</key>
- <false/>
-
- <!-- The retry-after value (in seconds) to return with a 503 error. -->
- <key>HTTPRetryAfter</key>
- <integer>180</integer>
-
- <!-- For child-master IPC. [empty = use tcp] -->
- <key>ControlSocket</key>
- <string>carddavd.sock</string>
-
- <!-- Support for Memcached -->
- <key>Memcached</key>
- <dict>
- <key>MaxClients</key>
- <integer>5</integer>
- <key>memcached</key>
- <string>memcached</string> <!-- Find in PATH -->
- <key>Options</key>
- <array>
- <!--<string>-vv</string>-->
- </array>
- </dict>
-
-
- <!--
- Twisted
- -->
-
- <key>Twisted</key>
- <dict>
- <key>twistd</key>
- <string>../Twisted/bin/twistd</string>
- </dict>
-
-
- <key>Localization</key>
- <dict>
- <key>LocalesDirectory</key>
- <string>locales</string>
- <key>Language</key>
- <string>English</string>
- </dict>
-
- <!--
- Directory Address Book
- -->
-
- <!-- Disable Directory Address Book-->
- <!--
- <key>DirectoryAddressBook</key>
- <false/>
- -->
-
- <!-- Open Directory-backed Directory Address Book -->
- <key>DirectoryAddressBook</key>
- <dict>
-
- <key>Enabled</key>
- <true/>
-
- <key>type</key>
- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>xmlFile</key>
- <string>./conf/auth/accounts-test.xml</string>
- </dict>
- </dict>
-
- <!-- allow unauthenticated users to access the directory address book -->
- <key>AnonymousDirectoryAddressBookAccess</key>
- <false/>
-
- </dict>
-</plist>
Deleted: CalendarServer/trunk/conf/carddavd.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd.plist 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/conf/carddavd.plist 2010-09-10 19:50:28 UTC (rev 6272)
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
-
- <!--
- Public network address information
-
- This is the server's public network address, which is provided to
- clients in URLs and the like. It may or may not be the network
- address that the server is listening to directly, though it is by
- default. For example, it may be the address of a load balancer or
- proxy which forwards connections to the server.
- -->
-
- <!-- Network host name [empty = system host name] -->
- <key>ServerHostName</key>
- <string></string> <!-- The hostname clients use when connecting -->
-
- <!-- HTTP port [0 = disable HTTP] -->
- <key>HTTPPort</key>
- <integer>80</integer>
-
- <!-- SSL port [0 = disable HTTPS] -->
- <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
- <!--
- <key>SSLPort</key>
- <integer>443</integer>
- -->
-
- <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
- <key>RedirectHTTPToHTTPS</key>
- <false/>
-
-
- <!--
- Network address configuration information
-
- This configures the actual network address that the server binds to.
- -->
-
- <!-- List of IP addresses to bind to [empty = all] -->
- <key>BindAddresses</key>
- <array>
- </array>
-
- <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
- <key>BindHTTPPorts</key>
- <array>
- </array>
-
- <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
- <key>BindSSLPorts</key>
- <array>
- </array>
-
-
- <!--
- Data Store
- -->
-
- <!-- Server root -->
- <key>ServerRoot</key>
- <string>/Library/AddressBookServer</string>
-
- <!-- Data root -->
- <key>DataRoot</key>
- <string>Data</string>
-
- <!-- Document root -->
- <key>DocumentRoot</key>
- <string>Documents</string>
-
- <!-- Configuration root -->
- <key>ConfigRoot</key>
- <string>/etc/cardavd</string>
-
- <!-- Run root -->
- <key>RunRoot</key>
- <string>/var/run</string>
-
- <!-- Child aliases -->
- <key>Aliases</key>
- <dict>
- <!--
- <key>foo</key>
- <dict>
- <key>path</key>
- <string>/path/to/foo</string>
- </dict>
- -->
- </dict>
-
-
- <!--
- Quotas and limits
- -->
-
- <!-- User quota (in bytes) [0 = no quota] -->
- <key>UserQuota</key>
- <integer>104857600</integer> <!-- 100Mb -->
-
-
- <!--
- Directory service
-
- A directory service provides information about principals (eg.
- users, groups, locations and resources) to the server.
-
- A variety of directory services are available for use.
- -->
-
- <!-- Disable resource service. -->
- <key>ResourceService</key>
- <dict>
- <key>Enabled</key>
- <false/>
- </dict>
-
-
- <!-- XML File Directory Service -->
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>xmlFile</key>
- <string>accounts.xml</string>
- </dict>
- </dict>
-
- <!-- Open Directory Service (Mac OS X) -->
- <!--
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- <key>cacheTimeout</key>
- <integer>30</integer>
- </dict>
- </dict>
- -->
-
- <!--
- Special principals
-
- These principals are granted special access and/or perform
- special roles on the server.
- -->
-
- <!-- Principals with "DAV:all" access (relative URLs) -->
- <key>AdminPrincipals</key>
- <array>
- <!-- <string>/principals/__uids__/AEB68DD7-D2B8-4D4D-A574-2A4533DF36A4/</string> -->
- </array>
-
- <!-- Principals with "DAV:read" access (relative URLs) -->
- <key>ReadPrincipals</key>
- <array>
- <!-- <string>/principals/__uids__/983C8238-FB6B-4D92-9242-89C0A39E5F81/</string> -->
- </array>
-
-
- <!--
- Permissions
- -->
-
- <!-- Anonymous read access for root resource -->
- <key>EnableAnonymousReadRoot</key>
- <true/>
-
- <!-- Anonymous read access for resource hierarchy -->
- <key>EnableAnonymousReadNav</key>
- <false/>
-
- <!-- Enables directory listings for principals -->
- <key>EnablePrincipalListings</key>
- <false/>
-
-
- <!--
- Authentication
- -->
-
- <key>Authentication</key>
- <dict>
-
- <!-- Clear text; best avoided -->
- <key>Basic</key>
- <dict>
- <key>Enabled</key>
- <false/>
- </dict>
-
- <!-- Digest challenge/response -->
- <key>Digest</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>Algorithm</key>
- <string>md5</string>
- <key>Qop</key>
- <string></string>
- </dict>
-
- <!-- Kerberos/SPNEGO -->
- <key>Kerberos</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>ServicePrincipal</key>
- <string></string>
- </dict>
-
- </dict>
-
-
- <!--
- Logging
- -->
-
- <!-- Log root -->
- <key>LogRoot</key>
- <string>/var/log/cardavd</string>
-
- <!-- Apache-style access log -->
- <key>AccessLogFile</key>
- <string>access.log</string>
- <key>RotateAccessLog</key>
- <true/>
-
- <!-- Server activity log -->
- <key>ErrorLogFile</key>
- <string>error.log</string>
-
- <!-- Log levels -->
- <key>DefaultLogLevel</key>
- <string>warn</string> <!-- debug, info, warn, error -->
-
- <!-- Global server stats -->
- <key>GlobalStatsSocket</key>
- <string>carddavd-stats.sock</string>
-
- <!-- Server process ID file -->
- <key>PIDFile</key>
- <string>carddavd.pid</string>
-
-
- <!--
- SSL/TLS
- -->
-
- <!-- Public key -->
- <key>SSLCertificate</key>
- <string></string>
-
- <!-- SSL authority chain (for intermediate certs) -->
- <key>SSLAuthorityChain</key>
- <string></string>
-
- <!-- Private key -->
- <key>SSLPrivateKey</key>
- <string></string>
-
-
- <!--
- Process management
- -->
-
- <key>UserName</key>
- <string>daemon</string>
-
- <key>GroupName</key>
- <string>daemon</string>
-
- <key>ProcessType</key>
- <string>Combined</string>
-
- <key>MultiProcess</key>
- <dict>
- <key>ProcessCount</key>
- <integer>0</integer> <!-- 0 = larger of: 4 or (2 * CPU count) -->
- </dict>
-
-
- </dict>
-</plist>
Modified: CalendarServer/trunk/doc/caldavd.8
===================================================================
--- CalendarServer/trunk/doc/caldavd.8 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/doc/caldavd.8 2010-09-10 19:50:28 UTC (rev 6272)
@@ -61,11 +61,6 @@
SSL, and the names of other files can specified.
.It /etc/caldavd/server.pem
PEM-format server keys for use with SSL.
-.It /Library/CalendarServer/Documents
-The server's document root, which is the used as the backing store for
-the HTTP resources on the server.
-.It /Library/CalendarServer/Data
-Directory containing server data other than HTTP resources.
.It /var/log/caldavd/access.log
The server's access log file, in a format similar to Apache HTTPd's
access log.
Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/support/Makefile.Apple 2010-09-10 19:50:28 UTC (rev 6272)
@@ -93,7 +93,7 @@
$(_v) $(INSTALL_FILE) "$(Sources)/doc/calendarserver_purge_events.8" "$(DSTROOT)$(MANDIR)/man8"
$(_v) gzip -9 -f "$(DSTROOT)$(MANDIR)/man8/"*.[0-9]
@echo "Installing launchd config..."
- $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/$(Project)"
+ $(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/Server/Calendar and Contacts"
$(_v) $(INSTALL_DIRECTORY) -o calendar -g calendar -m 0755 "$(DSTROOT)$(VARDIR)/log/caldavd"
$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons"
$(_v) $(INSTALL_FILE) "$(Sources)/contrib/launchd/calendarserver.plist" "$(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons/org.calendarserver.calendarserver.plist"
Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2010-09-10 18:59:20 UTC (rev 6271)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2010-09-10 19:50:28 UTC (rev 6272)
@@ -161,7 +161,7 @@
#
# Data store
#
- "ServerRoot" : "/Library/CalendarServer",
+ "ServerRoot" : "/var/db/caldavd",
"DataRoot" : "Data",
"DatabaseRoot" : "Database",
"DocumentRoot" : "Documents",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100910/8e45b542/attachment-0001.html>
More information about the calendarserver-changes
mailing list