[CalendarServer-changes] [1297] CalendarServer/trunk/conf

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 28 17:39:49 PST 2007


Revision: 1297
          http://trac.macosforge.org/projects/calendarserver/changeset/1297
Author:   wsanchez at apple.com
Date:     2007-02-28 17:39:49 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
Add error log file name to test plist.
Remove caldavd-test-logged.plist.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test.plist

Removed Paths:
-------------
    CalendarServer/trunk/conf/caldavd-test-logged.plist

Deleted: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-28 22:15:55 UTC (rev 1296)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-03-01 01:39:49 UTC (rev 1297)
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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
-
-    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 Computer//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 -->
-  <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>
-
-
-  <!--
-    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>
-    <string>127.0.0.1</string>
-  </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
-  -->
-
-  <!-- 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>
-    <key>type</key>
-    <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-  
-    <key>params</key>
-    <dict>
-      <key>xmlFile</key>
-      <string>conf/accounts-test.xml</string>
-    </dict>
-  </dict>
-  
-  <!--  Open Directory Service -->
-  <!--
-  <key>DirectoryService</key>
-  <dict>
-    <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>
-  -->
-
-  <!--  Apache-style Basic Directory Service -->
-  <!--
-  <key>DirectoryService</key>
-  <dict>
-    <key>type</key>
-    <string>twistedcaldav.directory.apache.BasicDirectoryService</string>
-  
-    <key>params</key>
-    <dict>
-      <key>userFile</key>
-      <string>conf/basic</string>
-      <key>groupFile</key>
-      <string>conf/group</string>
-    </dict>
-  </dict>
-  -->
-
-  <!--  Apache-style Digest Directory Service -->
-  <!--
-  <key>DirectoryService</key>
-  <dict>
-    <key>type</key>
-    <string>twistedcaldav.directory.apache.DigestDirectoryService</string>
-  
-    <key>params</key>
-    <dict>
-      <key>userFile</key>
-      <string>conf/digest</string>
-      <key>groupFile</key>
-      <string>conf/group</string>
-    </dict>
-  </dict>
-  -->
-
-  <!--  SQL Directory Service -->
-  <!--
-  <key>DirectoryService</key>
-  <dict>
-    <key>type</key>
-    <string>twistedcaldav.directory.sqldb.SQLDirectoryService</string>
-  
-    <key>params</key>
-    <dict>
-      <key>dbParentPath</key>
-      <string>twistedcaldav/test/data/</string>
-      <key>xmlFile</key>
-      <string>conf/accounts-test.xml</string>
-    </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/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/>
-
-
-  <!--
-    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>
-      <false/>
-      <key>Algorithm</key>
-      <string>md5</string>
-    </dict>
-
-    <!-- Kerberos/SPNEGO -->
-    <key>Kerberos</key>
-    <dict>
-      <key>Enabled</key>
-      <false/>
-      <key>ServicePrincipal</key>
-      <string></string>
-      <key>Realm</key>
-      <string></string>
-    </dict>
-
-  </dict>
-
-
-  <!--
-    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>Combined</string>
-
-  <key>MultiProcess</key>
-  <dict>
-    <key>ProcessCount</key>
-    <integer>4</integer>
-
-    <key>LoadBalancer</key>
-    <dict>
-      <key>Enabled</key>
-      <false/>
-
-	  <!-- One of the strings below must be used - the others commented out -->
-      <key>Scheduler</key>
-
-      <!-- Least Connections -->
-      <string>LeastConnections</string>
-
-      <!-- Round Robin -->
-      <!-- <string>RoundRobin</string> -->
-
-      <!-- Least Connections and Round Robin -->
-      <!-- <string>LeastConnectionsAndRoundRobin</string> -->
-    </dict>
-
-  </dict>
-
-
-  <!--
-    Service ACLs
-  -->
-
-  <key>EnableSACLs</key>
-  <false/>
-
-
-  <!--
-    Non-standard CalDAV extensions
-  -->
-
-  <!-- Calendar Drop Box -->
-  <key>EnableDropBox</key>
-  <true/>
-
-  <!-- Drop Box Notifications -->
-  <key>EnableNotifications</key>
-  <true/>
-
-  <!--
-    Twisted
-  -->
-
-  <key>Twisted</key>
-  <dict>
-      <key>twistd</key>
-      <string>../Twisted/bin/twistd</string>
-  </dict>
-
-  <!--
-    Python Director
-  -->
-
-  <key>PythonDirector</key>
-  <dict>
-      <key>pydir</key>
-      <string>../pydirector-1.0.0/pydir.py</string>
-
-      <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-28 22:15:55 UTC (rev 1296)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-03-01 01:39:49 UTC (rev 1297)
@@ -244,7 +244,7 @@
 
   <!-- Server activity log -->
   <key>ErrorLogFile</key>
-  <string>-</string>
+  <string>logs/error.log</string>
 
   <!-- Server statistics file -->
   <key>ServerStatsFile</key>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070228/a7c55fb8/attachment.html


More information about the calendarserver-changes mailing list