[CalendarServer-changes] [3264] CalendarServer/trunk/conf
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 29 16:32:00 PDT 2008
Revision: 3264
http://trac.macosforge.org/projects/calendarserver/changeset/3264
Author: wsanchez at apple.com
Date: 2008-10-29 16:32:00 -0700 (Wed, 29 Oct 2008)
Log Message:
-----------
Move sampe auth configs to conf/auth/.
Modified Paths:
--------------
CalendarServer/trunk/conf/caldavd-test.plist
Added Paths:
-----------
CalendarServer/trunk/conf/auth/
CalendarServer/trunk/conf/auth/accounts-test.xml
CalendarServer/trunk/conf/auth/accounts.dtd
CalendarServer/trunk/conf/auth/accounts.htauth
CalendarServer/trunk/conf/auth/accounts.htdigest
CalendarServer/trunk/conf/auth/accounts.xml
CalendarServer/trunk/conf/auth/groups
Removed Paths:
-------------
CalendarServer/trunk/conf/accounts-test.xml
CalendarServer/trunk/conf/accounts.dtd
CalendarServer/trunk/conf/accounts.xml
Deleted: CalendarServer/trunk/conf/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/accounts-test.xml 2008-10-29 23:28:17 UTC (rev 3263)
+++ CalendarServer/trunk/conf/accounts-test.xml 2008-10-29 23:32:00 UTC (rev 3264)
@@ -1,95 +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 accounts SYSTEM "accounts.dtd">
-
-<accounts realm="Test Realm">
- <user>
- <uid>admin</uid>
- <guid>admin</guid>
- <password>admin</password>
- <name>Super User</name>
- <first-name>Super</first-name>
- <last-name>User</last-name>
- </user>
- <user>
- <uid>apprentice</uid>
- <guid>apprentice</guid>
- <password>apprentice</password>
- <name>Apprentice Super User</name>
- <first-name>Apprentice</first-name>
- <last-name>Super User</last-name>
- </user>
- <user repeat="99">
- <uid>user%02d</uid>
- <guid>user%02d</guid>
- <password>user%02d</password>
- <name>User %02d</name>
- <cuaddr>mailto:user%02d at example.com</cuaddr>
- <first-name>User</first-name>
- <last-name>%02d</last-name>
- </user>
- <user repeat="10">
- <uid>public%02d</uid>
- <guid>public%02d</guid>
- <password>public%02d</password>
- <name>Public %02d</name>
- <cuaddr>mailto:public%02d at example.com</cuaddr>
- <first-name>Public</first-name>
- <last-name>%02d</last-name>
- </user>
- <location repeat="10">
- <uid>location%02d</uid>
- <guid>location%02d</guid>
- <password>location%02d</password>
- <name>Room %02d</name>
- <auto-schedule/>
- </location>
- <resource repeat="10">
- <uid>resource%02d</uid>
- <guid>resource%02d</guid>
- <password>resource%02d</password>
- <name>Resource %02d</name>
- <auto-schedule/>
- <proxies>
- <member type="users">user01</member>
- </proxies>
- <read-only-proxies>
- <member type="users">user03</member>
- </read-only-proxies>
- </resource>
- <group>
- <uid>group01</uid>
- <guid>group01</guid>
- <password>group01</password>
- <name>Group 01</name>
- <members>
- <member type="users">user01</member>
- </members>
- </group>
- <group>
- <uid>disabledgroup</uid>
- <guid>disabledgroup</guid>
- <password>disabledgroup</password>
- <name>Disabled Group</name>
- <members>
- <member type="users">user01</member>
- </members>
- <disable-calendar/>
- </group>
-</accounts>
Deleted: CalendarServer/trunk/conf/accounts.dtd
===================================================================
--- CalendarServer/trunk/conf/accounts.dtd 2008-10-29 23:28:17 UTC (rev 3263)
+++ CalendarServer/trunk/conf/accounts.dtd 2008-10-29 23:32:00 UTC (rev 3264)
@@ -1,45 +0,0 @@
-<!--
-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.
--->
-
-<!ELEMENT accounts (user*, group*, resource*, location*) >
- <!ATTLIST accounts realm CDATA "">
-
- <!ELEMENT user (uid, guid, password, name, cuaddr*, disable-calendar?)>
- <!ATTLIST user repeat CDATA "1">
-
- <!ELEMENT group (uid, guid, password, name, members, cuaddr*, disable-calendar?)>
- <!ATTLIST group repeat CDATA "1">
-
- <!ELEMENT resource (uid, guid, password, name, cuaddr*, auto-schedule?, proxies?, read-only-proxies?)>
- <!ATTLIST resource repeat CDATA "1">
-
- <!ELEMENT location (uid, guid, password, name, cuaddr*, auto-schedule?, proxies?, read-only-proxies?)>
- <!ATTLIST location repeat CDATA "1">
-
- <!ELEMENT member (#PCDATA)>
- <!ATTLIST member type (users|groups|locations|resources) "users">
-
- <!ELEMENT uid (#PCDATA)>
- <!ELEMENT guid (#PCDATA)>
- <!ELEMENT password (#PCDATA)>
- <!ELEMENT name (#PCDATA)>
- <!ELEMENT cuaddr (#PCDATA)>
- <!ELEMENT members (member*)>
- <!ELEMENT auto-schedule EMPTY>
- <!ELEMENT disable-calendar EMPTY>
- <!ELEMENT proxies (member*)>
- <!ELEMENT read-only-proxies (member*)>
->
Deleted: CalendarServer/trunk/conf/accounts.xml
===================================================================
--- CalendarServer/trunk/conf/accounts.xml 2008-10-29 23:28:17 UTC (rev 3263)
+++ CalendarServer/trunk/conf/accounts.xml 2008-10-29 23:32:00 UTC (rev 3264)
@@ -1,51 +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 accounts SYSTEM "accounts.dtd">
-
-<accounts realm="Test Realm">
- <user>
- <uid>admin</uid>
- <password>admin</password>
- <name>Super User</name>
- </user>
- <user>
- <uid>test</uid>
- <password>test</password>
- <name>Test User</name>
- <cuaddr>mailto:testuser at example.com</cuaddr>
- </user>
- <group>
- <uid>users</uid>
- <password>users</password>
- <name>Users Group</name>
- <members>
- <member type="users">test</member>
- </members>
- </group>
- <location>
- <uid>mercury</uid>
- <password>mercury</password>
- <name>Mecury Conference Room, Building 1, 2nd Floor</name>
- <auto-schedule/>
- <proxies>
- <member type="users">test</member>
- </proxies>
- </location>
-</accounts>
-
Copied: CalendarServer/trunk/conf/auth/accounts-test.xml (from rev 3261, CalendarServer/trunk/conf/accounts-test.xml)
===================================================================
--- CalendarServer/trunk/conf/auth/accounts-test.xml (rev 0)
+++ CalendarServer/trunk/conf/auth/accounts-test.xml 2008-10-29 23:32:00 UTC (rev 3264)
@@ -0,0 +1,95 @@
+<?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 accounts SYSTEM "accounts.dtd">
+
+<accounts realm="Test Realm">
+ <user>
+ <uid>admin</uid>
+ <guid>admin</guid>
+ <password>admin</password>
+ <name>Super User</name>
+ <first-name>Super</first-name>
+ <last-name>User</last-name>
+ </user>
+ <user>
+ <uid>apprentice</uid>
+ <guid>apprentice</guid>
+ <password>apprentice</password>
+ <name>Apprentice Super User</name>
+ <first-name>Apprentice</first-name>
+ <last-name>Super User</last-name>
+ </user>
+ <user repeat="99">
+ <uid>user%02d</uid>
+ <guid>user%02d</guid>
+ <password>user%02d</password>
+ <name>User %02d</name>
+ <cuaddr>mailto:user%02d at example.com</cuaddr>
+ <first-name>User</first-name>
+ <last-name>%02d</last-name>
+ </user>
+ <user repeat="10">
+ <uid>public%02d</uid>
+ <guid>public%02d</guid>
+ <password>public%02d</password>
+ <name>Public %02d</name>
+ <cuaddr>mailto:public%02d at example.com</cuaddr>
+ <first-name>Public</first-name>
+ <last-name>%02d</last-name>
+ </user>
+ <location repeat="10">
+ <uid>location%02d</uid>
+ <guid>location%02d</guid>
+ <password>location%02d</password>
+ <name>Room %02d</name>
+ <auto-schedule/>
+ </location>
+ <resource repeat="10">
+ <uid>resource%02d</uid>
+ <guid>resource%02d</guid>
+ <password>resource%02d</password>
+ <name>Resource %02d</name>
+ <auto-schedule/>
+ <proxies>
+ <member type="users">user01</member>
+ </proxies>
+ <read-only-proxies>
+ <member type="users">user03</member>
+ </read-only-proxies>
+ </resource>
+ <group>
+ <uid>group01</uid>
+ <guid>group01</guid>
+ <password>group01</password>
+ <name>Group 01</name>
+ <members>
+ <member type="users">user01</member>
+ </members>
+ </group>
+ <group>
+ <uid>disabledgroup</uid>
+ <guid>disabledgroup</guid>
+ <password>disabledgroup</password>
+ <name>Disabled Group</name>
+ <members>
+ <member type="users">user01</member>
+ </members>
+ <disable-calendar/>
+ </group>
+</accounts>
Copied: CalendarServer/trunk/conf/auth/accounts.dtd (from rev 3261, CalendarServer/trunk/conf/accounts.dtd)
===================================================================
--- CalendarServer/trunk/conf/auth/accounts.dtd (rev 0)
+++ CalendarServer/trunk/conf/auth/accounts.dtd 2008-10-29 23:32:00 UTC (rev 3264)
@@ -0,0 +1,45 @@
+<!--
+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.
+-->
+
+<!ELEMENT accounts (user*, group*, resource*, location*) >
+ <!ATTLIST accounts realm CDATA "">
+
+ <!ELEMENT user (uid, guid, password, name, cuaddr*, disable-calendar?)>
+ <!ATTLIST user repeat CDATA "1">
+
+ <!ELEMENT group (uid, guid, password, name, members, cuaddr*, disable-calendar?)>
+ <!ATTLIST group repeat CDATA "1">
+
+ <!ELEMENT resource (uid, guid, password, name, cuaddr*, auto-schedule?, proxies?, read-only-proxies?)>
+ <!ATTLIST resource repeat CDATA "1">
+
+ <!ELEMENT location (uid, guid, password, name, cuaddr*, auto-schedule?, proxies?, read-only-proxies?)>
+ <!ATTLIST location repeat CDATA "1">
+
+ <!ELEMENT member (#PCDATA)>
+ <!ATTLIST member type (users|groups|locations|resources) "users">
+
+ <!ELEMENT uid (#PCDATA)>
+ <!ELEMENT guid (#PCDATA)>
+ <!ELEMENT password (#PCDATA)>
+ <!ELEMENT name (#PCDATA)>
+ <!ELEMENT cuaddr (#PCDATA)>
+ <!ELEMENT members (member*)>
+ <!ELEMENT auto-schedule EMPTY>
+ <!ELEMENT disable-calendar EMPTY>
+ <!ELEMENT proxies (member*)>
+ <!ELEMENT read-only-proxies (member*)>
+>
Added: CalendarServer/trunk/conf/auth/accounts.htauth
===================================================================
--- CalendarServer/trunk/conf/auth/accounts.htauth (rev 0)
+++ CalendarServer/trunk/conf/auth/accounts.htauth 2008-10-29 23:32:00 UTC (rev 3264)
@@ -0,0 +1,2 @@
+admin:lzNnaQ7ZCPOlo
+test:m4cActsgkmlbI
Added: CalendarServer/trunk/conf/auth/accounts.htdigest
===================================================================
--- CalendarServer/trunk/conf/auth/accounts.htdigest (rev 0)
+++ CalendarServer/trunk/conf/auth/accounts.htdigest 2008-10-29 23:32:00 UTC (rev 3264)
@@ -0,0 +1,3 @@
+
+admin:Test Realm:ffa04aeb43a8a2efbe653956e04b739f
+test:Test Realm:688067d58e519c828459eee8c9f65043
Copied: CalendarServer/trunk/conf/auth/accounts.xml (from rev 3261, CalendarServer/trunk/conf/accounts.xml)
===================================================================
--- CalendarServer/trunk/conf/auth/accounts.xml (rev 0)
+++ CalendarServer/trunk/conf/auth/accounts.xml 2008-10-29 23:32:00 UTC (rev 3264)
@@ -0,0 +1,51 @@
+<?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 accounts SYSTEM "accounts.dtd">
+
+<accounts realm="Test Realm">
+ <user>
+ <uid>admin</uid>
+ <password>admin</password>
+ <name>Super User</name>
+ </user>
+ <user>
+ <uid>test</uid>
+ <password>test</password>
+ <name>Test User</name>
+ <cuaddr>mailto:testuser at example.com</cuaddr>
+ </user>
+ <group>
+ <uid>users</uid>
+ <password>users</password>
+ <name>Users Group</name>
+ <members>
+ <member type="users">test</member>
+ </members>
+ </group>
+ <location>
+ <uid>mercury</uid>
+ <password>mercury</password>
+ <name>Mecury Conference Room, Building 1, 2nd Floor</name>
+ <auto-schedule/>
+ <proxies>
+ <member type="users">test</member>
+ </proxies>
+ </location>
+</accounts>
+
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2008-10-29 23:28:17 UTC (rev 3263)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2008-10-29 23:32:00 UTC (rev 3264)
@@ -105,7 +105,7 @@
<key>params</key>
<dict>
<key>xmlFile</key>
- <string>conf/accounts-test.xml</string>
+ <string>conf/auth/accounts-test.xml</string>
</dict>
</dict>
@@ -137,10 +137,12 @@
<key>params</key>
<dict>
+ <key>realmName</key>
+ <string>Test Realm</string>
<key>userFile</key>
- <string>conf/basic</string>
+ <string>conf/auth/accounts.htauth</string>
<key>groupFile</key>
- <string>conf/group</string>
+ <string>conf/auth/groups</string>
</dict>
</dict>
-->
@@ -154,13 +156,15 @@
<key>params</key>
<dict>
+ <key>realmName</key>
+ <string>Test Realm</string>
<key>userFile</key>
- <string>conf/digest</string>
+ <string>conf/auth/accounts.htdigest</string>
<key>groupFile</key>
- <string>conf/group</string>
+ <string>conf/auth/groups</string>
</dict>
</dict>
- -->
+ -->
<!-- SQL Directory Service (Experimental) -->
<!--
@@ -174,7 +178,7 @@
<key>dbParentPath</key>
<string>twistedcaldav/test/data/</string>
<key>xmlFile</key>
- <string>conf/accounts-test.xml</string>
+ <string>conf/auth/accounts-test.xml</string>
</dict>
</dict>
-->
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081029/dfd1acd7/attachment-0001.html>
More information about the calendarserver-changes
mailing list