[CalendarServer-changes] [642] CalendarServer/trunk/conf
source_changes at macosforge.org
source_changes at macosforge.org
Fri Dec 1 13:50:28 PST 2006
Revision: 642
http://trac.macosforge.org/projects/calendarserver/changeset/642
Author: wsanchez at apple.com
Date: 2006-12-01 13:50:27 -0800 (Fri, 01 Dec 2006)
Log Message:
-----------
Clean up example configurations
Modified Paths:
--------------
CalendarServer/trunk/conf/accounts.xml
CalendarServer/trunk/conf/caldavd-test.plist
CalendarServer/trunk/conf/caldavd.plist
Added Paths:
-----------
CalendarServer/trunk/conf/accounts-test.xml
Copied: CalendarServer/trunk/conf/accounts-test.xml (from rev 639, CalendarServer/trunk/conf/accounts.xml)
===================================================================
--- CalendarServer/trunk/conf/accounts-test.xml (rev 0)
+++ CalendarServer/trunk/conf/accounts-test.xml 2006-12-01 21:50:27 UTC (rev 642)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006 Apple Computer, 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 accounts SYSTEM "accounts.dtd">
+
+<accounts realm="Test Realm">
+ <user>
+ <uid>admin</uid>
+ <pswd>admin</pswd>
+ <name>Super User</name>
+ </user>
+ <user>
+ <uid>proxy</uid>
+ <pswd>proxy</pswd>
+ <name>User who can authorize as someone else</name>
+ <canproxy/> <!-- FIXME: Is the directory the right place to configure this bit? -->
+ </user>
+ <user repeat="99">
+ <uid>user%02d</uid>
+ <pswd>user%02d</pswd>
+ <name>User %02d</name>
+ <cuaddr>mailto:user%02d at example.com</cuaddr>
+ </user>
+ <user repeat="10">
+ <uid>public%02d</uid>
+ <pswd>public%02d</pswd>
+ <name>Public %02d</name>
+ <cuaddr>mailto:public%02d at example.com</cuaddr>
+ </user>
+ <resource repeat="10">
+ <uid>resource%02d</uid>
+ <pswd>resource%02d</pswd>
+ <name>Room %02d</name>
+ </resource>
+</accounts>
Modified: CalendarServer/trunk/conf/accounts.xml
===================================================================
--- CalendarServer/trunk/conf/accounts.xml 2006-12-01 20:00:39 UTC (rev 641)
+++ CalendarServer/trunk/conf/accounts.xml 2006-12-01 21:50:27 UTC (rev 642)
@@ -30,21 +30,23 @@
<name>User who can authorize as someone else</name>
<canproxy/> <!-- FIXME: Is the directory the right place to configure this bit? -->
</user>
- <user repeat="99">
- <uid>user%02d</uid>
- <pswd>user%02d</pswd>
- <name>User %02d</name>
- <cuaddr>mailto:user%02d at example.com</cuaddr>
+ <user>
+ <uid>test</uid>
+ <pswd>test</pswd>
+ <name>Test User</name>
+ <cuaddr>mailto:testuser at example.com</cuaddr>
</user>
- <user repeat="10">
- <uid>public%02d</uid>
- <pswd>public%02d</pswd>
- <name>Public %02d</name>
- <cuaddr>mailto:public%02d at example.com</cuaddr>
- </user>
- <resource repeat="10">
- <uid>resource%02d</uid>
- <pswd>resource%02d</pswd>
- <name>Room %02d</name>
+ <group>
+ <uid>users</uid>
+ <pswd>users</pswd>
+ <name>Users Group</name>
+ <members>
+ <uid>test</uid>
+ </members>
+ </group>
+ <resource>
+ <uid>mercury</uid>
+ <pswd>mercury</pswd>
+ <name>Mecury Conference Room, Building 1, 2nd Floor</name>
</resource>
</accounts>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2006-12-01 20:00:39 UTC (rev 641)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2006-12-01 21:50:27 UTC (rev 642)
@@ -71,38 +71,72 @@
<key>params</key>
<dict>
<key>xmlFile</key>
- <string>conf/accounts.xml</string>
+ <string>conf/accounts-test.xml</string>
</dict>
</dict>
+
+ <!-- Open Directory Service -->
+ <!--
+ <key>DirectoryService</key>
+ <dict>
+ <key>type</key>
+ <string>twistedcaldav.directory.appleopendirectory.OpenDirectoryService</string>
- <!-- SQL Directory Service -->
+ <key>params</key>
+ <dict>
+ <key>node</key>
+ <string>/Search</string>
+ </dict>
+ </dict>
+ -->
+
+ <!-- Apache-style Basic Directory Service -->
<!--
- <key>twistedcaldav.directory.sqldb.DirectoryService</key>
+ <key>DirectoryService</key>
<dict>
<key>type</key>
- <string>SQLDirectoryService</string>
+ <string>twistedcaldav.directory.apache.BasicDirectoryService</string>
<key>params</key>
<dict>
- <key>dbParentPath</key>
- <string>twistedcaldav/test/data/</string>
- <key>xmlFile</key>
- <string>conf/accounts.xml</string>
+ <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>
- <!-- Open Directory Service -->
+ <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.appleopendirectory.OpenDirectoryService</string>
+ <string>twistedcaldav.directory.sqldb.SQLDirectoryService</string>
<key>params</key>
<dict>
- <key>node</key>
- <string>/Search</string>
+ <key>dbParentPath</key>
+ <string>twistedcaldav/test/data/</string>
+ <key>xmlFile</key>
+ <string>conf/accounts-test.xml</string>
</dict>
</dict>
-->
Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist 2006-12-01 20:00:39 UTC (rev 641)
+++ CalendarServer/trunk/conf/caldavd.plist 2006-12-01 21:50:27 UTC (rev 642)
@@ -77,23 +77,6 @@
</dict>
-->
- <!-- SQL Directory Service -->
- <!--
- <key>twistedcaldav.directory.sqldb.DirectoryService</key>
- <dict>
- <key>type</key>
- <string>SQLDirectoryService</string>
-
- <key>params</key>
- <dict>
- <key>dbParentPath</key>
- <string>/Library/CalendarServer/Documents</string>
- <key>xmlFile</key>
- <string>/etc/caldavd/accounts.xml</string>
- </dict>
- </dict>
- -->
-
<!-- Open Directory Service -->
<key>DirectoryService</key>
<dict>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061201/abf88049/attachment.html
More information about the calendarserver-changes
mailing list