[CalendarServer-changes] [5140] CalendarServer/trunk/conf
source_changes at macosforge.org
source_changes at macosforge.org
Tue Feb 16 22:07:43 PST 2010
Revision: 5140
http://trac.macosforge.org/projects/calendarserver/changeset/5140
Author: glyph at apple.com
Date: 2010-02-16 22:07:42 -0800 (Tue, 16 Feb 2010)
Log Message:
-----------
Adjust carddavd options to catch up with required configuration changes
Modified Paths:
--------------
CalendarServer/trunk/conf/carddavd-apple.plist
CalendarServer/trunk/conf/carddavd-test.plist
CalendarServer/trunk/conf/carddavd.plist
Modified: CalendarServer/trunk/conf/carddavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd-apple.plist 2010-02-17 01:07:56 UTC (rev 5139)
+++ CalendarServer/trunk/conf/carddavd-apple.plist 2010-02-17 06:07:42 UTC (rev 5140)
@@ -161,6 +161,13 @@
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>
Modified: CalendarServer/trunk/conf/carddavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd-test.plist 2010-02-17 01:07:56 UTC (rev 5139)
+++ CalendarServer/trunk/conf/carddavd-test.plist 2010-02-17 06:07:42 UTC (rev 5140)
@@ -75,15 +75,30 @@
<!--
Data Store
-->
+ <!-- Server root -->
+ <key>ServerRoot</key>
+ <string>data</string>
<!-- Data root -->
<key>DataRoot</key>
- <string>data/</string>
+ <string>Data/</string>
<!-- Document root -->
<key>DocumentRoot</key>
- <string>twistedcaldav/test/data/</string>
+ <string>Documents</string>
+ <!-- Configuration root -->
+ <key>ConfigRoot</key>
+ <string>./conf</string>
+
+ <!-- Log root -->
+ <key>LogRoot</key>
+ <string>Logs</string>
+
+ <!-- Run root -->
+ <key>RunRoot</key>
+ <string>Run</string>
+
<!-- Child aliases -->
<key>Aliases</key>
<dict>
@@ -114,6 +129,12 @@
<key>MaxInstancesForRRULE</key>
<integer>400</integer>
+ <!-- Disable resource service. -->
+ <key>ResourceService</key>
+ <dict>
+ <key>Enabled</key>
+ <false/>
+ </dict>
<!--
Directory service
@@ -123,7 +144,6 @@
A variety of directory services are available for use.
-->
-
<!-- XML File Directory Service -->
<key>DirectoryService</key>
<dict>
@@ -133,7 +153,7 @@
<key>params</key>
<dict>
<key>xmlFile</key>
- <string>conf/auth/accounts-test.xml</string>
+ <string>./conf/auth/accounts-test.xml</string>
</dict>
</dict>
@@ -173,7 +193,7 @@
<dict>
<key>xmlFiles</key>
<array>
- <string>conf/auth/augments-test.xml</string>
+ <string>./conf/auth/augments-test.xml</string>
</array>
</dict>
</dict>
@@ -241,7 +261,7 @@
-->
<key>ProxyLoadFromFile</key>
- <string>conf/auth/proxies-test.xml</string>
+ <string>./conf/auth/proxies-test.xml</string>
<!--
Special principals
@@ -264,7 +284,7 @@
<!-- Principals that can pose as other principals -->
<key>SudoersFile</key>
- <string>conf/sudoers.plist</string>
+ <string>./conf/sudoers.plist</string>
<!-- Create "proxy access" principals -->
<key>EnableProxyPrincipals</key>
@@ -352,7 +372,7 @@
<!-- Apache-style access log -->
<key>AccessLogFile</key>
- <string>logs/access.log</string>
+ <string>access.log</string>
<key>RotateAccessLog</key>
<false/>
<key>MoreAccessLogData</key>
@@ -360,7 +380,7 @@
<!-- Server activity log -->
<key>ErrorLogFile</key>
- <string>logs/error.log</string>
+ <string>error.log</string>
<!-- Log levels -->
<key>DefaultLogLevel</key>
@@ -377,7 +397,7 @@
<!-- Global server stats -->
<key>GlobalStatsSocket</key>
- <string>logs/carddavd-stats.sock</string>
+ <string>carddavd-stats.sock</string>
<!-- Global server stats logging period -->
<key>GlobalStatsLoggingPeriod</key>
@@ -389,11 +409,11 @@
<!-- Server statistics file -->
<key>ServerStatsFile</key>
- <string>logs/stats.plist</string>
+ <string>stats.plist</string>
<!-- Server process ID file -->
<key>PIDFile</key>
- <string>logs/carddavd.pid</string>
+ <string>carddavd.pid</string>
<!--
@@ -567,7 +587,7 @@
<array>
</array>
<key>Servers</key>
- <string>conf/servertoserver-test.xml</string>
+ <string>./conf/servertoserver-test.xml</string>
</dict>
<!-- iMIP protocol options -->
@@ -686,7 +706,7 @@
<!-- A unix socket used for communication between the child and master processes.
An empty value tells the server to use a tcp socket instead. -->
<key>ControlSocket</key>
- <string>logs/carddavd.sock</string>
+ <string>carddavd.sock</string>
<!-- Support for Memcached -->
<key>Memcached</key>
@@ -744,7 +764,7 @@
<key>params</key>
<dict>
<key>xmlFile</key>
- <string>conf/auth/accounts-test.xml</string>
+ <string>./conf/auth/accounts-test.xml</string>
</dict>
</dict>
Modified: CalendarServer/trunk/conf/carddavd.plist
===================================================================
--- CalendarServer/trunk/conf/carddavd.plist 2010-02-17 01:07:56 UTC (rev 5139)
+++ CalendarServer/trunk/conf/carddavd.plist 2010-02-17 06:07:42 UTC (rev 5140)
@@ -97,6 +97,14 @@
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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100216/57140240/attachment-0001.html>
More information about the calendarserver-changes
mailing list