[CalendarServer-changes] [4431] CalendarServer/branches/users/wsanchez/deployment/conf
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 7 11:47:59 PDT 2009
Revision: 4431
http://trac.macosforge.org/projects/calendarserver/changeset/4431
Author: wsanchez at apple.com
Date: 2009-07-07 11:47:58 -0700 (Tue, 07 Jul 2009)
Log Message:
-----------
Update notifications config
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist
CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist
Modified: CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist 2009-07-06 21:32:06 UTC (rev 4430)
+++ CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist 2009-07-07 18:47:58 UTC (rev 4431)
@@ -416,17 +416,21 @@
<key>Notifications</key>
<dict>
+ <!-- Time spent coalescing notifications before delivery -->
<key>CoalesceSeconds</key>
- <integer>10</integer>
+ <integer>3</integer>
+
<key>InternalNotificationHost</key>
<string>localhost</string>
+
<key>InternalNotificationPort</key>
<integer>62309</integer>
<key>Services</key>
- <array>
+ <dict>
+ <key>SimpleLineNotifier</key>
<dict>
- <!-- Simple notification service (for testing) -->
+ <!-- Simple line notification service (for testing) -->
<key>Service</key>
<string>twistedcaldav.notify.SimpleLineNotifierService</string>
<key>Enabled</key>
@@ -435,6 +439,7 @@
<integer>62308</integer>
</dict>
+ <key>XMPPNotifier</key>
<dict>
<!-- XMPP notification service -->
<key>Service</key>
@@ -458,15 +463,31 @@
<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 messages to this account for debugging -->
- <key>TestJID</key>
- <string></string>
+ <!-- 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>
- </array>
+ </dict>
</dict>
Modified: CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist 2009-07-06 21:32:06 UTC (rev 4430)
+++ CalendarServer/branches/users/wsanchez/deployment/conf/caldavd.plist 2009-07-07 18:47:58 UTC (rev 4431)
@@ -1,352 +1,349 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (c) 2006-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2007 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
+ 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.
- -->
+ 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 Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
-<dict>
+ <dict>
- <!--
- Public network address information
+ <!--
+ 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.
- -->
+ 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 -->
- <key>ServerHostName</key>
- <string>localhost</string>
+ <!-- Network host name -->
+ <key>ServerHostName</key>
+ <string>localhost</string>
- <!-- HTTP port [0 = disable HTTP] -->
- <key>HTTPPort</key>
- <integer>8008</integer>
+ <!-- HTTP port [0 = disable HTTP] -->
+ <key>HTTPPort</key>
+ <integer>8008</integer>
- <!-- SSL port [0 = disable HTTPS] -->
- <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
- <!--
- <key>SSLPort</key>
- <integer>8443</integer>
- -->
+ <!-- SSL port [0 = disable HTTPS] -->
+ <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
+ <!--
+ <key>SSLPort</key>
+ <integer>8443</integer>
+ -->
- <!--
- Network address configuration information
+ <!--
+ Network address configuration information
- This configures the actual network address that the server binds to.
- -->
+ 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 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 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>
+ <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
+ <key>BindSSLPorts</key>
+ <array></array>
- <!--
- Data Store
- -->
+ <!--
+ Data Store
+ -->
- <!-- Data root -->
- <key>DataRoot</key>
- <string>/var/run/caldavd</string>
+ <!-- Data root -->
+ <key>DataRoot</key>
+ <string>/var/run/caldavd</string>
- <!-- Document root -->
- <key>DocumentRoot</key>
- <string>/Library/CalendarServer/Documents</string>
+ <!-- Document root -->
+ <key>DocumentRoot</key>
+ <string>/Library/CalendarServer/Documents</string>
- <!-- User quota (in bytes) -->
- <key>UserQuota</key>
- <integer>104857600</integer><!-- 100Mb -->
+ <!-- User quota (in bytes) -->
+ <key>UserQuota</key>
+ <integer>104857600</integer><!-- 100Mb -->
- <!-- Attachment size limit (in bytes) -->
- <key>MaximumAttachmentSize</key>
- <integer>1048576</integer><!-- 1Mb -->
+ <!-- Attachment size limit (in bytes) -->
+ <key>MaximumAttachmentSize</key>
+ <integer>1048576</integer><!-- 1Mb -->
- <!--
- Directory service
+ <!--
+ Directory service
- A directory service provides information about principals (eg.
- users, groups, locations and resources) to the server.
+ 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.
- -->
+ 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>
+ <!-- XML File Directory Service -->
+ <!--
+ <key>DirectoryService</key>
<dict>
- <key>xmlFile</key>
- <string>/etc/caldavd/accounts.xml</string>
+ <key>type</key>
+ <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
+
+ <key>params</key>
+ <dict>
+ <key>xmlFile</key>
+ <string>/etc/caldavd/accounts.xml</string>
+ </dict>
</dict>
- </dict>
- -->
-
- <!-- Open Directory Service -->
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
-
- <key>params</key>
+ -->
+
+ <!-- Open Directory Service -->
+ <key>DirectoryService</key>
<dict>
- <key>node</key>
- <string>/Search</string>
- <key>requireComputerRecord</key>
- <true/>
+ <key>type</key>
+ <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
+
+ <key>params</key>
+ <dict>
+ <key>node</key>
+ <string>/Search</string>
+ <key>requireComputerRecord</key>
+ <true/>
+ </dict>
</dict>
- </dict>
- <!--
- Special principals
+ <!--
+ Special principals
- These principals are granted special access and/or perform
- special roles on the server.
- -->
+ 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/users/admin/</string> -->
- </array>
+ <!-- Principals with "DAV:all" access (relative URLs) -->
+ <key>AdminPrincipals</key>
+ <array>
+ <!-- <string>/principals/users/admin/</string> -->
+ </array>
- <!-- Principals with "DAV:read" access (relative URLs) -->
- <key>ReadPrincipals</key>
- <array>
- <!-- <string>/principals/users/apprentice/</string> -->
- </array>
+ <!-- Principals with "DAV:read" access (relative URLs) -->
+ <key>ReadPrincipals</key>
+ <array>
+ <!-- <string>/principals/users/apprentice/</string> -->
+ </array>
- <!-- Principals that can pose as other principals -->
- <key>SudoersFile</key>
- <string>/etc/caldavd/sudoers.plist</string>
+ <!-- Principals that can pose as other principals -->
+ <key>SudoersFile</key>
+ <string>/etc/caldavd/sudoers.plist</string>
- <!-- Create "proxy access" principals -->
- <key>EnableProxyPrincipals</key>
- <true/>
+ <!-- Create "proxy access" principals -->
+ <key>EnableProxyPrincipals</key>
+ <true/>
- <!--
- Permissions
- -->
+ <!--
+ Permissions
+ -->
- <!-- Anonymous read access for root resource -->
- <key>EnableAnonymousReadRoot</key>
- <true/>
+ <!-- Anonymous read access for root resource -->
+ <key>EnableAnonymousReadRoot</key>
+ <true/>
- <!-- Anonymous read access for resource hierarchy -->
- <key>EnableAnonymousReadNav</key>
- <false/>
+ <!-- Anonymous read access for resource hierarchy -->
+ <key>EnableAnonymousReadNav</key>
+ <false/>
- <!-- Enables directory listings for principals -->
- <key>EnablePrincipalListings</key>
- <true/>
+ <!-- Enables directory listings for principals -->
+ <key>EnablePrincipalListings</key>
+ <true/>
- <!-- Render calendar collections as a monolithic iCalendar object -->
- <key>EnableMonolithicCalendars</key>
- <true/>
+ <!-- Render calendar collections as a monolithic iCalendar object -->
+ <key>EnableMonolithicCalendars</key>
+ <true/>
- <!--
- Authentication
- -->
+ <!--
+ Authentication
+ -->
- <key>Authentication</key>
- <dict>
-
- <!-- Clear text; best avoided -->
- <key>Basic</key>
+ <key>Authentication</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>
+ <!-- Clear text; best avoided -->
+ <key>Basic</key>
+ <dict>
+ <key>Enabled</key>
+ <false/>
+ </dict>
- <!-- Kerberos/SPNEGO -->
- <key>Kerberos</key>
- <dict>
- <key>Enabled</key>
- <true/>
- <key>ServicePrincipal</key>
- <string></string>
- </dict>
+ <!-- Digest challenge/response -->
+ <key>Digest</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>Algorithm</key>
+ <string>md5</string>
+ <key>Qop</key>
+ <string></string>
+ </dict>
- </dict>
+ <!-- Kerberos/SPNEGO -->
+ <key>Kerberos</key>
+ <dict>
+ <key>Enabled</key>
+ <true/>
+ <key>ServicePrincipal</key>
+ <string></string>
+ </dict>
+ </dict>
- <!--
- Logging
- -->
- <!-- Apache-style access log -->
- <key>AccessLogFile</key>
- <string>/var/log/caldavd/access.log</string>
- <key>RotateAccessLog</key>
- <false/>
+ <!--
+ Logging
+ -->
- <!-- Server activity log -->
- <key>ErrorLogFile</key>
- <string>/var/log/caldavd/error.log</string>
+ <!-- Apache-style access log -->
+ <key>AccessLogFile</key>
+ <string>/var/log/caldavd/access.log</string>
+ <key>RotateAccessLog</key>
+ <false/>
- <!-- Log Levels -->
- <key>DefaultLogLevel</key>
- <string>info</string> <!-- debug, info, warn, error -->
+ <!-- Server activity log -->
+ <key>ErrorLogFile</key>
+ <string>/var/log/caldavd/error.log</string>
- <!-- Server statistics file -->
- <key>ServerStatsFile</key>
- <string>/var/run/caldavd/stats.plist</string>
+ <!-- Log Levels -->
+ <key>DefaultLogLevel</key>
+ <string>info</string> <!-- debug, info, warn, error -->
- <!-- Server process ID file -->
- <key>PIDFile</key>
- <string>/var/run/caldavd.pid</string>
+ <!-- Server statistics file -->
+ <key>ServerStatsFile</key>
+ <string>/var/run/caldavd/stats.plist</string>
+ <!-- Server process ID file -->
+ <key>PIDFile</key>
+ <string>/var/run/caldavd.pid</string>
- <!--
- SSL/TLS
- -->
- <!-- Public key -->
- <key>SSLCertificate</key>
- <string></string>
+ <!--
+ SSL/TLS
+ -->
- <!-- Private key -->
- <key>SSLPrivateKey</key>
- <string></string>
+ <!-- Public key -->
+ <key>SSLCertificate</key>
+ <string></string>
+ <!-- Private key -->
+ <key>SSLPrivateKey</key>
+ <string></string>
- <!--
- Process management
- -->
- <key>UserName</key>
- <string>calendar</string>
+ <!--
+ Process management
+ -->
- <key>GroupName</key>
- <string>calendar</string>
+ <key>UserName</key>
+ <string>calendar</string>
- <key>ProcessType</key>
- <string>Combined</string>
+ <key>GroupName</key>
+ <string>calendar</string>
- <key>MultiProcess</key>
- <dict>
- <key>ProcessCount</key>
- <integer>0</integer> <!-- 0 = one per CPU core -->
- </dict>
+ <key>ProcessType</key>
+ <string>Combined</string>
+ <key>MultiProcess</key>
+ <dict>
+ <key>ProcessCount</key>
+ <integer>0</integer> <!-- 0 = one per CPU core -->
+ </dict>
- <!--
- Service ACLs
- -->
- <key>EnableSACLs</key>
- <true/>
+ <!--
+ Service ACLs
+ -->
+ <key>EnableSACLs</key>
+ <true/>
- <!--
- Notifications
- -->
- <key>Notifications</key>
- <dict>
- <!-- Time spent coalescing notifications -->
- <key>CoalesceSeconds</key>
- <integer>10</integer>
+ <!--
+ Notifications
+ -->
- <key>Services</key>
- <array>
+ <key>Notifications</key>
+ <dict>
+ <!-- Time spent coalescing notifications before delivery -->
+ <key>CoalesceSeconds</key>
+ <integer>3</integer>
+
+ <key>Services</key>
<dict>
- <!-- XMPP notification service -->
- <key>Service</key>
- <string>twistedcaldav.notify.XMPPNotifierService</string>
- <key>Enabled</key>
- <false/>
+ <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>
+ <!-- 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>
+ <!-- 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>
-
- <!-- Sends a presence notification to XMPP server at this interval (prevents disconnect) -->
- <key>KeepAliveSeconds</key>
- <integer>120</integer>
+ <!-- PubSub service address -->
+ <key>ServiceAddress</key>
+ <string>pubsub.xmpp.host.name</string>
+ </dict>
</dict>
- </array>
- </dict>
+ </dict>
- <!--
- Miscellaneous items
- -->
+ <!--
+ Miscellaneous items
+ -->
- <!-- Support for Content-Encoding compression options as specified in RFC2616 Section 3.5 -->
- <key>ResponseCompression</key>
- <true/>
+ <!-- Support for Content-Encoding compression options as specified in RFC2616 Section 3.5 -->
+ <key>ResponseCompression</key>
+ <true/>
- <!--
- Non-standard CalDAV extensions
- -->
+ <!--
+ Non-standard CalDAV extensions
+ -->
- <!-- Calendar Drop Box -->
- <key>EnableDropBox</key>
- <true/>
+ <!-- Calendar Drop Box -->
+ <key>EnableDropBox</key>
+ <true/>
- <!-- Private Events -->
- <key>EnablePrivateEvents</key>
- <true/>
+ <!-- Private Events -->
+ <key>EnablePrivateEvents</key>
+ <true/>
- <!-- Timezone Service -->
- <key>EnableTimezoneService</key>
- <true/>
+ <!-- Timezone Service -->
+ <key>EnableTimezoneService</key>
+ <true/>
</dict>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090707/21b879d2/attachment-0001.html>
More information about the calendarserver-changes
mailing list