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

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 17 09:56:34 PST 2010


Revision: 5143
          http://trac.macosforge.org/projects/calendarserver/changeset/5143
Author:   wsanchez at apple.com
Date:     2010-02-17 09:56:33 -0800 (Wed, 17 Feb 2010)
Log Message:
-----------
Clean up configs

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

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2010-02-17 06:36:55 UTC (rev 5142)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2010-02-17 17:56:33 UTC (rev 5143)
@@ -16,7 +16,7 @@
     limitations under the License.
   -->
 
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
 
@@ -92,10 +92,6 @@
     <key>ConfigRoot</key>
     <string>/etc/caldavd</string>
 
-    <!-- Log root -->
-    <key>LogRoot</key>
-    <string>/var/log/caldavd</string>
-
     <!-- Run root -->
     <key>RunRoot</key>
     <string>/var/run</string>
@@ -112,7 +108,12 @@
        -->
     </dict>
 
-    <!-- User quota (in bytes) -->
+
+    <!--
+        Quotas and limits
+      -->
+
+    <!-- User quota (in bytes) [0 = no quota] -->
     <key>UserQuota</key>
     <integer>104857600</integer><!-- 100Mb -->
 
@@ -170,93 +171,8 @@
       </dict>
     </dict>
 
-    <!--
-        Augment service
 
-        Augments for the directory service records to add calendar specific attributes.
-
-        A variety of augment services are available for use.
-        When using a partitioned server, a service that can be accessed from each host will be needed.
-      -->
-
-    <!-- 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>augments.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>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>
-     -->
-
-    <!--
         Special principals
 
         These principals are granted special access and/or perform
@@ -275,10 +191,6 @@
       <!-- <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/>
@@ -353,6 +265,10 @@
         Logging
       -->
 
+    <!-- Log root -->
+    <key>LogRoot</key>
+    <string>/var/log/caldavd</string>
+
     <!-- Apache-style access log -->
     <key>AccessLogFile</key>
     <string>access.log</string>
@@ -561,11 +477,7 @@
     <key>EnablePrivateEvents</key>
     <true/>
 
-    <!-- Timezone Service -->
-    <key>EnableTimezoneService</key>
-    <true/>
 
-
     <!--
         Miscellaneous items
       -->

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2010-02-17 06:36:55 UTC (rev 5142)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2010-02-17 17:56:33 UTC (rev 5143)
@@ -16,7 +16,7 @@
     limitations under the License.
   -->
 
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
 
@@ -43,10 +43,11 @@
     <key>SSLPort</key>
     <integer>8443</integer>
 
-    <!-- Redirect non-SSL ports to an SSL port -->
+    <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
     <key>RedirectHTTPToHTTPS</key>
     <false/>
 
+
     <!--
         Network address configuration information
 
@@ -75,7 +76,7 @@
 
     <!-- Server root -->
     <key>ServerRoot</key>
-    <string>data</string>
+    <string>./data</string>
 
     <!-- Data root -->
     <key>DataRoot</key>
@@ -89,13 +90,9 @@
     <key>ConfigRoot</key>
     <string>./conf</string>
 
-    <!-- Log root -->
-    <key>LogRoot</key>
-    <string>Logs</string>
-
     <!-- Run root -->
     <key>RunRoot</key>
-    <string>Run</string>
+    <string>Logs</string>
 
     <!-- Child aliases -->
     <key>Aliases</key>
@@ -109,7 +106,12 @@
        -->
     </dict>
 
-    <!-- User quota (in bytes) -->
+
+    <!--
+        Quotas and limits
+      -->
+
+    <!-- User quota (in bytes) [0 = no quota] -->
     <key>UserQuota</key>
     <integer>104857600</integer><!-- 100Mb -->
 
@@ -147,34 +149,9 @@
       <dict>
         <key>xmlFile</key>
         <string>./conf/auth/accounts-test.xml</string>
-        <key>recordTypes</key>
-        <array>
-            <string>users</string>
-            <string>groups</string>
-        </array>
       </dict>
     </dict>
     
-    <!-- Resource and Location Service -->
-    <key>ResourceService</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/resources-test.xml</string>
-        <key>recordTypes</key>
-        <array>
-            <string>locations</string>
-            <string>resources</string>
-        </array>
-      </dict>
-    </dict>
-    
     <!-- Open Directory Service (Mac OS X) -->
     <!--
     <key>DirectoryService</key>
@@ -192,15 +169,21 @@
     </dict>
     -->
 
-    <!--
-        Augment service
+    <!-- Resource and Location Service -->
+    <key>ResourceService</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/resources-test.xml</string>
+      </dict>
+    </dict>
 
-        Augments for the directory service records to add calendar specific attributes.
-
-        A variety of augment services are available for use.
-        When using a partitioned server, a service that can be accessed from each host will be needed.
-      -->
-
     <!-- XML File Augment Service -->
     <key>AugmentService</key>
     <dict>
@@ -215,7 +198,7 @@
         </array>
       </dict>
     </dict>
-    
+
     <!-- Sqlite Augment Service -->
     <!--
     <key>AugmentService</key>
@@ -278,9 +261,10 @@
     </dict>
      -->
 
-	<key>ProxyLoadFromFile</key>
+    <key>ProxyLoadFromFile</key>
     <string>./conf/auth/proxies-test.xml</string>
 
+
     <!--
         Special principals
 
@@ -359,7 +343,7 @@
       <key>Kerberos</key>
       <dict>
         <key>Enabled</key>
-        <false/>
+        <true/>
         <key>ServicePrincipal</key>
         <string></string>
       </dict>
@@ -386,6 +370,10 @@
         Logging
       -->
 
+    <!-- Log root -->
+    <key>LogRoot</key>
+    <string>Logs</string>
+
     <!-- Apache-style access log -->
     <key>AccessLogFile</key>
     <string>access.log</string>
@@ -409,18 +397,6 @@
       -->
     </dict>
 
-    <!-- Global server stats --> 
-    <key>GlobalStatsSocket</key> 
-    <string>caldavd-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 process ID file -->
     <key>PIDFile</key>
     <string>caldavd.pid</string>
@@ -438,6 +414,7 @@
       <key>HTTP</key>
       <false/>
     </dict>
+
     <!-- Enable accounting for specific principals -->
     <key>AccountingPrincipals</key>
     <array>
@@ -647,16 +624,16 @@
         </array>
       </dict>
 
-	  <!-- General options for scheduling -->
-	  <key>Options</key>
-	  <dict>
+      <!-- General options for scheduling -->
+      <key>Options</key>
+      <dict>
         <key>AllowGroupAsOrganizer</key>
         <false/>
         <key>AllowLocationAsOrganizer</key>
         <false/>
         <key>AllowResourceAsOrganizer</key>
         <false/>
-       </dict>
+      </dict>
 
     </dict>
 
@@ -713,8 +690,7 @@
     <key>HTTPRetryAfter</key>
     <integer>180</integer>
 
-    <!-- A unix socket used for communication between the child and master processes.
-         An empty value tells the server to use a tcp socket instead. -->
+    <!-- For child-master IPC. [empty = use tcp] -->
     <key>ControlSocket</key>
     <string>caldavd.sock</string>
 
@@ -727,7 +703,7 @@
       <string>memcached</string> <!-- Find in PATH -->
       <key>Options</key>
       <array>
-        <!--<string>-vv</string>-->
+        <!--<string>-vv</string>--> <!-- Be very verbose -->
       </array>
     </dict>
 

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2010-02-17 06:36:55 UTC (rev 5142)
+++ CalendarServer/trunk/conf/caldavd.plist	2010-02-17 17:56:33 UTC (rev 5143)
@@ -16,7 +16,7 @@
     limitations under the License.
   -->
 
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
 
@@ -92,10 +92,6 @@
     <key>ConfigRoot</key>
     <string>/etc/caldavd</string>
 
-    <!-- Log root -->
-    <key>LogRoot</key>
-    <string>/var/log/caldavd</string>
-
     <!-- Run root -->
     <key>RunRoot</key>
     <string>/var/run</string>
@@ -112,13 +108,18 @@
        -->
     </dict>
 
-    <!-- User quota (in bytes) -->
+
+    <!--
+        Quotas and limits
+      -->
+
+    <!-- User quota (in bytes) [0 = no quota] -->
     <key>UserQuota</key>
-    <integer>104857600</integer><!-- 100Mb -->
+    <integer>104857600</integer> <!-- 100Mb -->
 
     <!-- Attachment size limit (in bytes) -->
     <key>MaximumAttachmentSize</key>
-    <integer>1048576</integer><!-- 1Mb -->
+    <integer>1048576</integer> <!-- 1Mb -->
 
     <!-- Maximum number of unique attendees per entire event -->
     <!-- 0 for no limit -->
@@ -170,93 +171,8 @@
     </dict>
      -->
 
-    <!--
-        Augment service
 
-        Augments for the directory service records to add calendar specific attributes.
-
-        A variety of augment services are available for use.
-        When using a partitioned server, a service that can be accessed from each host will be needed.
-      -->
-
-    <!-- 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>augments.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>/etc/caldavd/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>
-     -->
-
-    <!--
         Special principals
 
         These principals are granted special access and/or perform
@@ -275,10 +191,6 @@
       <!-- <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/>
@@ -346,6 +258,10 @@
         Logging
       -->
 
+    <!-- Log root -->
+    <key>LogRoot</key>
+    <string>/var/log/caldavd</string>
+
     <!-- Apache-style access log -->
     <key>AccessLogFile</key>
     <string>access.log</string>

Modified: CalendarServer/trunk/conf/carddavd.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd.plist	2010-02-17 06:36:55 UTC (rev 5142)
+++ CalendarServer/trunk/conf/carddavd.plist	2010-02-17 17:56:33 UTC (rev 5143)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+    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.
@@ -36,13 +36,13 @@
 
     <!-- HTTP port [0 = disable HTTP] -->
     <key>HTTPPort</key>
-    <integer>8800</integer>
+    <integer>80</integer>
 
     <!-- SSL port [0 = disable HTTPS] -->
     <!-- (Must also configure SSLCertificate and SSLPrivateKey below) -->
     <!--
     <key>SSLPort</key>
-    <integer>8843</integer>
+    <integer>443</integer>
     -->
 
     <!-- Redirect non-SSL ports to an SSL port (if configured for SSL) -->
@@ -76,18 +76,48 @@
         Data Store
       -->
 
+    <!-- Server root -->
+    <key>ServerRoot</key>
+    <string>/Library/AddressBookServer</string>
+
     <!-- Data root -->
     <key>DataRoot</key>
-    <string>/Library/AddressBookServer/Data/</string>
+    <string>Data</string>
 
     <!-- Document root -->
     <key>DocumentRoot</key>
-    <string>/Library/AddressBookServer/Documents</string>
+    <string>Documents</string>
 
-    <!-- User quota (in bytes) -->
+    <!-- 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><!-- 104857600 = 100Mb ; use 0 for no quota -->
+    <integer>104857600</integer> <!-- 100Mb -->
 
+
     <!--
         Directory service
 
@@ -106,7 +136,6 @@
 
 
     <!-- XML File Directory Service -->
-    <!--
     <key>DirectoryService</key>
     <dict>
       <key>type</key>
@@ -115,12 +144,12 @@
       <key>params</key>
       <dict>
         <key>xmlFile</key>
-        <string>/etc/carddavd/accounts.xml</string>
+        <string>accounts.xml</string>
       </dict>
     </dict>
-    -->
     
-    <!-- Cache-on-Demand Open Directory Service (Mac OS X) -->
+    <!-- Open Directory Service (Mac OS X) -->
+    <!--
     <key>DirectoryService</key>
     <dict>
       <key>type</key>
@@ -130,18 +159,11 @@
       <dict>
         <key>node</key>
         <string>/Search</string>
-        <key>maxAvailableWaitSeconds</key>
-        <integer>120</integer>			 <!-- Wait for all nodes to be available before starting server.  -1 to wait forever, 0 to not wait -->
-        <key>node</key>
-        <string>/Search</string>
-        <key>restrictEnabledRecords</key>
-        <false/>
-        <key>restrictToGroup</key>
-        <string></string>
         <key>cacheTimeout</key>
         <integer>30</integer>
       </dict>
     </dict>
+     -->
 
     <!--
         Special principals
@@ -162,9 +184,6 @@
       <!-- <string>/principals/__uids__/983C8238-FB6B-4D92-9242-89C0A39E5F81/</string> -->
     </array>
 
-    <!-- Principals that can pose as other principals -->
-    <key>SudoersFile</key>
-    <string></string>  <!-- empty to disable <string>/etc/carddavd/sudoers.plist</string> -->
 
     <!--
         Permissions
@@ -172,7 +191,7 @@
 
     <!-- Anonymous read access for root resource -->
     <key>EnableAnonymousReadRoot</key>
-    <false/>
+    <true/>
 
     <!-- Anonymous read access for resource hierarchy -->
     <key>EnableAnonymousReadNav</key>
@@ -224,49 +243,34 @@
         Logging
       -->
 
+    <!-- Log root -->
+    <key>LogRoot</key>
+    <string>/var/log/cardavd</string>
+
     <!-- Apache-style access log -->
     <key>AccessLogFile</key>
-    <string>/var/log/carddavd/access.log</string>
+    <string>access.log</string>
     <key>RotateAccessLog</key>
-    <false/>
+    <true/>
 
     <!-- Server activity log -->
     <key>ErrorLogFile</key>
-    <string>/var/log/carddavd/error.log</string>
+    <string>error.log</string>
 
     <!-- Log levels -->
     <key>DefaultLogLevel</key>
     <string>warn</string> <!-- debug, info, warn, error -->
 
-    <!-- Server statistics file -->
-    <key>ServerStatsFile</key>
-    <string>/var/run/carddavd/stats.plist</string>
+    <!-- Global server stats -->
+    <key>GlobalStatsSocket</key>
+    <string>carddavd-stats.sock</string>
 
     <!-- Server process ID file -->
     <key>PIDFile</key>
-    <string>/var/run/carddavd.pid</string>
+    <string>carddavd.pid</string>
 
 
-    <!-- Global server stats -->
-    <key>GlobalStatsSocket</key>
-    <string>/var/run/carddavd-stats.sock</string>
-
     <!--
-	To snapshot every five minutes over the last hour:
-	    GlobalStatsLoggingPeriod : 60
-	    GlobalStatsLoggingFrequency : 12
-	Set GlobalStatsLoggingFrequency to 0 to disable the stats
-      -->
-
-    <!-- Global server stats logging period -->
-    <key>GlobalStatsLoggingPeriod</key>
-    <integer>60</integer>
-
-    <!-- Global server stats logging frequency -->
-    <key>GlobalStatsLoggingFrequency</key>
-    <integer>12</integer>
-
-    <!--
         SSL/TLS
       -->
 
@@ -274,6 +278,10 @@
     <key>SSLCertificate</key>
     <string></string>
 
+    <!-- SSL authority chain (for intermediate certs) -->
+    <key>SSLAuthorityChain</key>
+    <string></string>
+
     <!-- Private key -->
     <key>SSLPrivateKey</key>
     <string></string>
@@ -284,10 +292,10 @@
       -->
 
     <key>UserName</key>
-    <string>_carddav</string>
+    <string>daemon</string>
 
     <key>GroupName</key>
-    <string>_carddav</string>
+    <string>daemon</string>
 
     <key>ProcessType</key>
     <string>Combined</string>
@@ -295,157 +303,9 @@
     <key>MultiProcess</key>
     <dict>
       <key>ProcessCount</key>
-      <integer>0</integer> <!-- 0 = larger of: 2 or CPU count -->
+      <integer>0</integer> <!-- 0 = larger of: 4 or (2 * CPU count) -->
     </dict>
 
 
-
-
-    <!--
-        Miscellaneous items
-      -->
-
-    <!-- Maximum results returned by addressbook-query report -->
-    <key>MaxAddressBookQueryResults</key>
-    <integer>1000</integer>
-
-    <!-- Maximum hrefs in addressbook-multiget report -->
-    <key>MaxAddressBookMultigetHrefs</key>
-    <integer>5000</integer>
-
-    <!-- Service ACLs (Mac OS X) -->
-    <key>EnableSACLs</key>
-    <true/>
-
-    <!-- Support for Content-Encoding compression options as specified in RFC2616 Section 3.5 -->
-    <key>ResponseCompression</key>
-    <true/>
-
-    <!--
-        Directory Address Book
-      -->
-    
-    <!--  Disable Directory Address Book-->
-    <!--
-      <key>DirectoryAddressBook</key>
-      <false/>
-    -->
-    
-    <!-- Open Directory-backed Directory Address Book -->
-    <key>DirectoryAddressBook</key>
-    <dict>
-        <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</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>150</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/>
-    
-    <!--  enable search address book in user's home -->
-    <key>EnableSearchAddressBook</key>
-    <false/>
-    
-    <!--  enable find share report -->
-    <key>EnableFindSharedReport</key>
-    <false/>
-
-    </dict>
+  </dict>
 </plist>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100217/ddbe8e31/attachment-0001.html>


More information about the calendarserver-changes mailing list