[CalendarServer-changes] [1255] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 23 16:11:43 PST 2007
Revision: 1255
http://trac.macosforge.org/projects/calendarserver/changeset/1255
Author: wsanchez at apple.com
Date: 2007-02-23 16:11:43 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Comment config files
Modified Paths:
--------------
CalendarServer/trunk/conf/caldavd-test-logged.plist
CalendarServer/trunk/conf/caldavd-test.plist
CalendarServer/trunk/conf/caldavd.plist
CalendarServer/trunk/twistedcaldav/config.py
Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-23 23:33:14 UTC (rev 1254)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist 2007-02-24 00:11:43 UTC (rev 1255)
@@ -20,47 +20,76 @@
<plist version="1.0">
<dict>
- <key>Verbose</key>
- <false/>
+ <!--
+ Public network address information
- <key>RunStandalone</key>
- <true/>
+ 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.
+ -->
- <key>DocumentRoot</key>
- <string>twistedcaldav/test/data/</string>
-
- <key>BindAddresses</key>
- <array>
- <string>127.0.0.1</string>
- </array>
-
+ <!-- Network host name -->
<key>ServerHostName</key>
<string>localhost</string>
+ <!-- HTTP port (comment out to disable HTTP) -->
<key>HTTPPort</key>
<integer>8008</integer>
+ <!-- SSL port (comment out to disable HTTPS) -->
<key>SSLPort</key>
<integer>8443</integer>
- <key>SSLPrivateKey</key>
- <string>conf/server.pem</string>
- <key>SSLCertificate</key>
- <string>conf/server.pem</string>
+ <!--
+ Network address configuration information
- <key>AccessLogFile</key>
- <string>logs/server.log</string>
+ This configures the actual network address that the server binds to.
+ -->
- <key>ErrorLogFile</key>
- <string>logs/error.log</string>
+ <!-- List of IP addresses to bind to [empty = all] -->
+ <key>BindAddresses</key>
+ <array>
+ <string>127.0.0.1</string>
+ </array>
- <key>ServerStatsFile</key>
- <string>logs/stats.plist</string>
+ <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
+ <key>BindHTTPPorts</key>
+ <array></array>
- <key>PIDFile</key>
- <string>logs/caldavd.pid</string>
+ <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
+ <key>BindSSLPorts</key>
+ <array></array>
+
+ <!--
+ Data Store
+ -->
+
+ <!-- Document root -->
+ <key>DocumentRoot</key>
+ <string>twistedcaldav/test/data/</string>
+
+ <!-- User quota (in bytes) -->
+ <key>UserQuota</key>
+ <integer>104857600</integer><!-- 100Mb -->
+
+ <!-- Attachment size limit (in bytes) -->
+ <key>MaximumAttachmentSize</key>
+ <integer>1048576</integer><!-- 1Mb -->
+
+
+ <!--
+ 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>
@@ -73,7 +102,7 @@
<string>conf/accounts-test.xml</string>
</dict>
</dict>
-
+
<!-- Open Directory Service -->
<!--
<key>DirectoryService</key>
@@ -90,7 +119,7 @@
</dict>
</dict>
-->
-
+
<!-- Apache-style Basic Directory Service -->
<!--
<key>DirectoryService</key>
@@ -141,32 +170,45 @@
</dict>
</dict>
-->
-
- <key>MaximumAttachmentSize</key>
- <integer>1048576</integer><!-- 1Mb -->
- <key>UserQuota</key>
- <integer>104857600</integer><!-- 100Mb -->
- <key>EnableDropBox</key>
- <true/>
+ <!--
+ Special principals
- <key>EnableNotifications</key>
- <true/>
+ 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 that can pose as other principals -->
+ <key>SudoersFile</key>
+ <string>conf/sudoers.plist</string>
+
+ <!-- Create "proxy access" principals -->
<key>EnableProxyPrincipals</key>
<true/>
- <key>EnableSACLs</key>
- <false/>
+ <!--
+ 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>
@@ -174,6 +216,8 @@
<key>Algorithm</key>
<string>md5</string>
</dict>
+
+ <!-- Kerberos/SPNEGO -->
<key>Kerberos</key>
<dict>
<key>Enabled</key>
@@ -183,25 +227,92 @@
<key>Realm</key>
<string></string>
</dict>
+
</dict>
- <key>AdminPrincipals</key>
- <array>
- <string>/principals/users/admin/</string>
- </array>
- <key>SudoersFile</key>
- <string>conf/sudoers.plist</string>
-
+ <!--
+ Logging
+ -->
+
+ <key>Verbose</key>
+ <false/>
+
+ <!-- Apache-style access log -->
+ <key>AccessLogFile</key>
+ <string>logs/server.log</string>
+
+ <!-- Server activity log -->
+ <key>ErrorLogFile</key>
+ <string>logs/error.log</string>
+
+ <!-- Server statistics file -->
+ <key>ServerStatsFile</key>
+ <string>logs/stats.plist</string>
+
+ <!-- Server process ID file -->
+ <key>PIDFile</key>
+ <string>logs/caldavd.pid</string>
+
+
+ <!--
+ SSL/TLS
+ -->
+
+ <!-- Public key -->
+ <key>SSLCertificate</key>
+ <string>conf/server.pem</string>
+
+ <!-- Private key -->
+ <key>SSLPrivateKey</key>
+ <string>conf/server.pem</string>
+
+
+ <!--
+ Process management
+ -->
+
+ <key>UserName</key>
+ <string>calendar</string>
+
+ <key>GroupName</key>
+ <string>calendar</string>
+
<key>ProcessType</key>
- <string>Slave</string>
-
+ <string>Combined</string>
+
<key>MultiProcess</key>
<dict>
<key>ProcessCount</key>
- <integer>2</integer>
+ <integer>4</integer>
</dict>
+
+ <!--
+ Service ACLs
+ -->
+
+ <key>EnableSACLs</key>
+ <true/>
+
+
+ <!--
+ Non-standard CalDAV extensions
+ -->
+
+ <!-- Calendar Drop Box -->
+ <key>EnableDropBox</key>
+ <true/>
+
+ <!-- Drop Box Notifications -->
+ <key>EnableNotifications</key>
+ <true/>
+
+
+ <!--
+ Python Director
+ -->
+
<key>PythonDirector</key>
<dict>
<key>pydir</key>
@@ -210,5 +321,6 @@
<key>ConfigFile</key>
<string>conf/pydir.xml</string>
</dict>
+
</dict>
</plist>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2007-02-23 23:33:14 UTC (rev 1254)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2007-02-24 00:11:43 UTC (rev 1255)
@@ -20,47 +20,76 @@
<plist version="1.0">
<dict>
- <key>Verbose</key>
- <false/>
+ <!--
+ Public network address information
- <key>RunStandalone</key>
- <true/>
+ 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.
+ -->
- <key>DocumentRoot</key>
- <string>twistedcaldav/test/data/</string>
-
- <key>BindAddresses</key>
- <array>
- <string>127.0.0.1</string>
- </array>
-
+ <!-- Network host name -->
<key>ServerHostName</key>
<string>localhost</string>
+ <!-- HTTP port (comment out to disable HTTP) -->
<key>HTTPPort</key>
<integer>8008</integer>
+ <!-- SSL port (comment out to disable HTTPS) -->
<key>SSLPort</key>
<integer>8443</integer>
- <key>SSLPrivateKey</key>
- <string>conf/server.pem</string>
- <key>SSLCertificate</key>
- <string>conf/server.pem</string>
+ <!--
+ Network address configuration information
- <key>AccessLogFile</key>
- <string>logs/server.log</string>
+ This configures the actual network address that the server binds to.
+ -->
- <key>ErrorLogFile</key>
- <string>-</string>
+ <!-- List of IP addresses to bind to [empty = all] -->
+ <key>BindAddresses</key>
+ <array>
+ <string>127.0.0.1</string>
+ </array>
- <key>ServerStatsFile</key>
- <string>logs/stats.plist</string>
+ <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
+ <key>BindHTTPPorts</key>
+ <array></array>
- <key>PIDFile</key>
- <string>logs/caldavd.pid</string>
+ <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
+ <key>BindSSLPorts</key>
+ <array></array>
+
+ <!--
+ Data Store
+ -->
+
+ <!-- Document root -->
+ <key>DocumentRoot</key>
+ <string>twistedcaldav/test/data/</string>
+
+ <!-- User quota (in bytes) -->
+ <key>UserQuota</key>
+ <integer>104857600</integer><!-- 100Mb -->
+
+ <!-- Attachment size limit (in bytes) -->
+ <key>MaximumAttachmentSize</key>
+ <integer>1048576</integer><!-- 1Mb -->
+
+
+ <!--
+ 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>
@@ -73,7 +102,7 @@
<string>conf/accounts-test.xml</string>
</dict>
</dict>
-
+
<!-- Open Directory Service -->
<!--
<key>DirectoryService</key>
@@ -90,7 +119,7 @@
</dict>
</dict>
-->
-
+
<!-- Apache-style Basic Directory Service -->
<!--
<key>DirectoryService</key>
@@ -141,32 +170,45 @@
</dict>
</dict>
-->
-
- <key>MaximumAttachmentSize</key>
- <integer>1048576</integer><!-- 1Mb -->
- <key>UserQuota</key>
- <integer>104857600</integer><!-- 100Mb -->
- <key>EnableDropBox</key>
- <true/>
+ <!--
+ Special principals
- <key>EnableNotifications</key>
- <true/>
+ 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 that can pose as other principals -->
+ <key>SudoersFile</key>
+ <string>conf/sudoers.plist</string>
+
+ <!-- Create "proxy access" principals -->
<key>EnableProxyPrincipals</key>
<true/>
- <key>EnableSACLs</key>
- <false/>
+ <!--
+ 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>
@@ -174,6 +216,8 @@
<key>Algorithm</key>
<string>md5</string>
</dict>
+
+ <!-- Kerberos/SPNEGO -->
<key>Kerberos</key>
<dict>
<key>Enabled</key>
@@ -183,25 +227,92 @@
<key>Realm</key>
<string></string>
</dict>
+
</dict>
- <key>AdminPrincipals</key>
- <array>
- <string>/principals/users/admin/</string>
- </array>
- <key>SudoersFile</key>
- <string>conf/sudoers.plist</string>
-
+ <!--
+ Logging
+ -->
+
+ <key>Verbose</key>
+ <false/>
+
+ <!-- Apache-style access log -->
+ <key>AccessLogFile</key>
+ <string>logs/server.log</string>
+
+ <!-- Server activity log -->
+ <key>ErrorLogFile</key>
+ <string>-</string>
+
+ <!-- Server statistics file -->
+ <key>ServerStatsFile</key>
+ <string>logs/stats.plist</string>
+
+ <!-- Server process ID file -->
+ <key>PIDFile</key>
+ <string>logs/caldavd.pid</string>
+
+
+ <!--
+ SSL/TLS
+ -->
+
+ <!-- Public key -->
+ <key>SSLCertificate</key>
+ <string>conf/server.pem</string>
+
+ <!-- Private key -->
+ <key>SSLPrivateKey</key>
+ <string>conf/server.pem</string>
+
+
+ <!--
+ Process management
+ -->
+
+ <key>UserName</key>
+ <string>calendar</string>
+
+ <key>GroupName</key>
+ <string>calendar</string>
+
<key>ProcessType</key>
- <string>Slave</string>
-
+ <string>Combined</string>
+
<key>MultiProcess</key>
<dict>
<key>ProcessCount</key>
- <integer>2</integer>
+ <integer>4</integer>
</dict>
+
+ <!--
+ Service ACLs
+ -->
+
+ <key>EnableSACLs</key>
+ <true/>
+
+
+ <!--
+ Non-standard CalDAV extensions
+ -->
+
+ <!-- Calendar Drop Box -->
+ <key>EnableDropBox</key>
+ <true/>
+
+ <!-- Drop Box Notifications -->
+ <key>EnableNotifications</key>
+ <true/>
+
+
+ <!--
+ Python Director
+ -->
+
<key>PythonDirector</key>
<dict>
<key>pydir</key>
@@ -210,5 +321,6 @@
<key>ConfigFile</key>
<string>conf/pydir.xml</string>
</dict>
+
</dict>
</plist>
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2007-02-23 23:33:14 UTC (rev 1254)
+++ CalendarServer/trunk/conf/caldavd.plist 2007-02-24 00:11:43 UTC (rev 1255)
@@ -20,52 +20,74 @@
<plist version="1.0">
<dict>
- <key>Verbose</key>
- <false/>
+ <!--
+ Public network address information
- <key>RunStandalone</key>
- <true/>
+ 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.
+ -->
- <key>DocumentRoot</key>
- <string>/Library/CalendarServer/Documents</string>
-
- <key>BindAddresses</key>
- <array>
- </array>
-
+ <!-- Network host name -->
<key>ServerHostName</key>
<string>localhost</string>
- <key>UserName</key>
- <string>calendar</string>
-
- <key>GroupName</key>
- <string>calendar</string>
-
+ <!-- HTTP port (comment out to disable HTTP) -->
<key>HTTPPort</key>
<integer>8008</integer>
+ <!-- SSL port (comment out to disable HTTPS) -->
<key>SSLPort</key>
<integer>8443</integer>
- <key>SSLPrivateKey</key>
- <string>/etc/certificates/Default.key</string>
- <key>SSLCertificate</key>
- <string>/etc/certificates/Default.crt</string>
+ <!--
+ Network address configuration information
- <key>AccessLogFile</key>
- <string>/var/log/caldavd/server.log</string>
+ This configures the actual network address that the server binds to.
+ -->
- <key>ServerStatsFile</key>
- <string>/Library/CalendarServer/Documents/stats.plist</string>
+ <!-- List of IP addresses to bind to [empty = all] -->
+ <key>BindAddresses</key>
+ <array></array>
- <key>ErrorLogFile</key>
- <string>/var/log/caldavd/error.log</string>
+ <!-- List of port numbers to bind to for HTTP [empty = same as "Port"] -->
+ <key>BindHTTPPorts</key>
+ <array></array>
- <key>PIDFile</key>
- <string>/var/run/caldavd.pid</string>
+ <!-- List of port numbers to bind to for SSL [empty = same as "SSLPort"] -->
+ <key>BindSSLPorts</key>
+ <array></array>
+
+ <!--
+ Data Store
+ -->
+
+ <!-- Document root -->
+ <key>DocumentRoot</key>
+ <string>/Library/CalendarServer/Documents</string>
+
+ <!-- User quota (in bytes) -->
+ <key>UserQuota</key>
+ <integer>104857600</integer><!-- 100Mb -->
+
+ <!-- Attachment size limit (in bytes) -->
+ <key>MaximumAttachmentSize</key>
+ <integer>1048576</integer><!-- 1Mb -->
+
+
+ <!--
+ 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>
@@ -95,32 +117,45 @@
<true/>
</dict>
</dict>
-
- <key>MaximumAttachmentSize</key>
- <integer>1048576</integer><!-- 1Mb -->
- <key>UserQuota</key>
- <integer>104857600</integer><!-- 100Mb -->
- <key>EnableDropBox</key>
- <true/>
+ <!--
+ Special principals
- <key>EnableNotifications</key>
- <true/>
+ 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 that can pose as other principals -->
+ <key>SudoersFile</key>
+ <string>/etc/caldavd/sudoers.plist</string>
+
+ <!-- Create "proxy access" principals -->
<key>EnableProxyPrincipals</key>
<true/>
- <key>EnableSACLs</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>
@@ -128,6 +163,8 @@
<key>Algorithm</key>
<string>md5</string>
</dict>
+
+ <!-- Kerberos/SPNEGO -->
<key>Kerberos</key>
<dict>
<key>Enabled</key>
@@ -137,24 +174,86 @@
<key>Realm</key>
<string></string>
</dict>
+
</dict>
-<!--
- <key>AdminPrincipals</key>
- <array>
- <string>/principals/users/admin/</string>
- </array>
- -->
- <key>SudoersFile</key>
- <string>/etc/caldavd/sudoers.plist</string>
+ <!--
+ Logging
+ -->
+
+ <key>Verbose</key>
+ <false/>
+
+ <!-- Apache-style access log -->
+ <key>AccessLogFile</key>
+ <string>/var/log/caldavd/server.log</string>
+
+ <!-- Server activity log -->
+ <key>ErrorLogFile</key>
+ <string>/var/log/caldavd/error.log</string>
+
+ <!-- Server statistics file -->
+ <key>ServerStatsFile</key>
+ <string>/Library/CalendarServer/Documents/stats.plist</string>
+
+ <!-- Server process ID file -->
+ <key>PIDFile</key>
+ <string>/var/run/caldavd.pid</string>
+
+
+ <!--
+ SSL/TLS
+ -->
+
+ <!-- Public key -->
+ <key>SSLCertificate</key>
+ <string>/etc/certificates/Default.crt</string>
+
+ <!-- Private key -->
+ <key>SSLPrivateKey</key>
+ <string>/etc/certificates/Default.key</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>1</integer>
+ <integer>4</integer>
</dict>
+
+
+ <!--
+ Service ACLs
+ -->
+
+ <key>EnableSACLs</key>
+ <true/>
+
+
+ <!--
+ Non-standard CalDAV extensions
+ -->
+
+ <!-- Calendar Drop Box -->
+ <key>EnableDropBox</key>
+ <true/>
+
+ <!-- Drop Box Notifications -->
+ <key>EnableNotifications</key>
+ <true/>
+
</dict>
</plist>
Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2007-02-23 23:33:14 UTC (rev 1254)
+++ CalendarServer/trunk/twistedcaldav/config.py 2007-02-24 00:11:43 UTC (rev 1255)
@@ -26,10 +26,11 @@
#
# 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. 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.
#
"ServerHostName": "localhost", # Network host name.
"HTTPPort": None, # HTTP port (None to disable HTTP)
@@ -54,15 +55,15 @@
#
# 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.
#
"DirectoryService": {
+ "type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService",
"params": {
"node": "/Search",
"requireComputerRecord": True,
},
- "type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService"
},
#
@@ -91,7 +92,7 @@
"PIDFile" : "/var/run/caldavd.pid",
#
- # SSL
+ # SSL/TLS
#
"SSLCertificate": "/etc/certificates/Default.crt", # Public key
"SSLPrivateKey": "/etc/certificates/Default.key", # Private key
@@ -103,7 +104,7 @@
"GroupName": "daemon",
"ProcessType": "Slave",
"MultiProcess": {
- "ProcessCount": 10,
+ "ProcessCount": 4,
"LoadBalancer": {
"Enabled": True,
"Scheduler": "LeastConnections",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070223/3e78a0a7/attachment.html
More information about the calendarserver-changes
mailing list