[CalendarServer-changes] [582]
CalendarServer/branches/users/wsanchez/provisioning-2/conf
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 27 14:18:29 PST 2006
Revision: 582
http://trac.macosforge.org/projects/calendarserver/changeset/582
Author: wsanchez at apple.com
Date: 2006-11-27 14:18:29 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
dev uses standard repository.xml
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd-dev.plist
CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd.plist
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd-dev.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd-dev.plist 2006-11-27 22:10:05 UTC (rev 581)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd-dev.plist 2006-11-27 22:18:29 UTC (rev 582)
@@ -32,15 +32,15 @@
<key>Port</key>
<integer>8008</integer>
+ <key>SSLPort</key>
+ <integer>8443</integer>
+
<key>SSLEnable</key>
<true/>
<key>SSLOnly</key>
<false/>
- <key>SSLPort</key>
- <integer>8443</integer>
-
<key>SSLPrivateKey</key>
<string>conf/server.pem</string>
@@ -56,60 +56,63 @@
<key>PIDFile</key>
<string>caldavd.pid</string>
- <key>Repository</key>
- <string>conf/repository-dev.xml</string>
-
<key>CreateAccounts</key>
<true/>
<key>ResetAccountACLs</key>
<true/>
- <!-- Open Directory Service -->
- <!--
+ <!-- XML File Directory Service -->
<key>DirectoryService</key>
<dict>
<key>type</key>
- <string>OpenDirectoryService</string>
+ <string>XMLDirectoryService</string>
<key>params</key>
<dict>
- <key>node</key>
- <string>/Search</string>
+ <key>xmlFile</key>
+ <string>conf/accounts.xml</string>
</dict>
</dict>
- -->
- <!-- XML File Directory Service -->
+ <!-- SQL Directory Service -->
+ <!--
<key>DirectoryService</key>
<dict>
<key>type</key>
- <string>XMLDirectoryService</string>
+ <string>SQLDirectoryService</string>
<key>params</key>
<dict>
+ <key>dbParentPath</key>
+ <string>/Library/CalendarServer/Documents</string>
<key>xmlFile</key>
<string>conf/accounts.xml</string>
</dict>
</dict>
+ -->
- <!-- SQL Directory Service -->
+ <!-- Open Directory Service -->
<!--
<key>DirectoryService</key>
<dict>
<key>type</key>
- <string>SQLDirectoryService</string>
+ <string>OpenDirectoryService</string>
<key>params</key>
<dict>
- <key>dbParentPath</key>
- <string>/Library/CalendarServer/Documents</string>
- <key>xmlFile</key>
- <string>conf/accounts.xml</string>
+ <key>node</key>
+ <string>/Search</string>
</dict>
</dict>
-->
+ <key>MaximumAttachmentSizeBytes</key>
+ <integer>1048576</integer><!-- 1Mb -->
+
+ <key>UserQuotaBytes</key>
+ <integer>104857600</integer><!-- 100Mb -->
+
<key>DropBoxEnabled</key>
<true/>
@@ -125,14 +128,11 @@
<key>NotificationCollectionName</key>
<string>notifications</string>
+ <key>Repository</key>
+ <string>conf/repository.xml</string>
+
<key>twistdLocation</key>
<string>../Twisted/bin/twistd</string>
- <key>MaximumAttachmentSizeBytes</key>
- <integer>1048576</integer><!-- 1Mb -->
-
- <key>UserQuotaBytes</key>
- <integer>104857600</integer><!-- 100Mb -->
-
</dict>
</plist>
Modified: CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd.plist 2006-11-27 22:10:05 UTC (rev 581)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/conf/caldavd.plist 2006-11-27 22:18:29 UTC (rev 582)
@@ -32,15 +32,15 @@
<key>Port</key>
<integer>8008</integer>
+ <key>SSLPort</key>
+ <integer>8443</integer>
+
<key>SSLEnable</key>
<true/>
<key>SSLOnly</key>
<false/>
- <key>SSLPort</key>
- <integer>8443</integer>
-
<key>SSLPrivateKey</key>
<string>/etc/certificates/Default.key</string>
@@ -56,28 +56,12 @@
<key>PIDFile</key>
<string>/var/log/caldavd/caldavd.pid</string>
- <key>Repository</key>
- <string>/etc/caldavd/repository.xml</string>
-
<key>CreateAccounts</key>
<true/>
<key>ResetAccountACLs</key>
<true/>
- <!-- Open Directory Service -->
- <key>DirectoryService</key>
- <dict>
- <key>type</key>
- <string>OpenDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>node</key>
- <string>/Search</string>
- </dict>
- </dict>
-
<!-- XML File Directory Service -->
<!--
<key>DirectoryService</key>
@@ -110,6 +94,25 @@
</dict>
-->
+ <!-- Open Directory Service -->
+ <key>DirectoryService</key>
+ <dict>
+ <key>type</key>
+ <string>OpenDirectoryService</string>
+
+ <key>params</key>
+ <dict>
+ <key>node</key>
+ <string>/Search</string>
+ </dict>
+ </dict>
+
+ <key>MaximumAttachmentSizeBytes</key>
+ <integer>1048576</integer><!-- 1Mb -->
+
+ <key>UserQuotaBytes</key>
+ <integer>104857600</integer><!-- 100Mb -->
+
<key>DropBoxEnabled</key>
<true/>
@@ -125,14 +128,11 @@
<key>NotificationCollectionName</key>
<string>notifications</string>
+ <key>Repository</key>
+ <string>/etc/caldavd/repository.xml</string>
+
<key>twistdLocation</key>
<string>/usr/share/caldavd/bin/twistd</string>
- <key>MaximumAttachmentSizeBytes</key>
- <integer>1048576</integer><!-- 1Mb -->
-
- <key>UserQuotaBytes</key>
- <integer>104857600</integer><!-- 100Mb -->
-
</dict>
</plist>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061127/f87b8478/attachment.html
More information about the calendarserver-changes
mailing list