[CalendarServer-changes] [13098] CalendarServer/branches/users/sagen/move2who-4/conf/auth

[source_changes at macosforge.org]

Revision: 13098
          http://trac.calendarserver.org//changeset/13098
Author:   sagen at apple.com
Date:     2014-04-01 13:11:18 -0700 (Tue, 01 Apr 2014)
Log Message:
-----------
More autoschedule tweaks to test accounts

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml	2014-04-01 20:01:18 UTC (rev 13097)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml	2014-04-01 20:11:18 UTC (rev 13098)
@@ -23,10 +23,16 @@
     <enable-addressbook>true</enable-addressbook>
 </record>
 <record>
-    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1004</uid>
-    <auto-schedule-mode>none</auto-schedule-mode>
+    <uid>Default-Location</uid>
+    <enable-calendar>true</enable-calendar>
     <enable-addressbook>true</enable-addressbook>
+    <auto-schedule-mode>automatic</auto-schedule-mode>
+</record>
+<record>
+    <uid>Default-Resource</uid>
     <enable-calendar>true</enable-calendar>
+    <enable-addressbook>true</enable-addressbook>
+    <auto-schedule-mode>automatic</auto-schedule-mode>
 </record>
 <record>
     <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1005</uid>
@@ -66,7 +72,7 @@
 </record>
 <record>
     <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1011</uid>
-    <auto-schedule-mode>automatic</auto-schedule-mode>
+    <auto-schedule-mode>decline-always</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
     <auto-accept-group>97C1351D-35E7-41E9-8F6F-72DDB9136001</auto-accept-group>

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py	2014-04-01 20:01:18 UTC (rev 13097)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py	2014-04-01 20:11:18 UTC (rev 13098)
@@ -179,12 +179,6 @@
 out.write("<augments>\n")
 
 augments = (
-    # resource04
-    (RESOURCEGUIDS % 4, {
-        "auto-schedule-mode": "none",
-        "enable-calendar": "true",
-        "enable-addressbook": "true",
-    }),
     # resource05
     (RESOURCEGUIDS % 5, {
         "auto-schedule-mode": "none",
@@ -223,7 +217,7 @@
     }),
     # resource11
     (RESOURCEGUIDS % 11, {
-        "auto-schedule-mode": "automatic",
+        "auto-schedule-mode": "decline-always",
         "auto-accept-group": GROUPGUIDS % 1,
         "enable-calendar": "true",
         "enable-addressbook": "true",
@@ -237,6 +231,22 @@
 </record>
 """)
 
+out.write("""<record>
+    <uid>Default-Location</uid>
+    <enable-calendar>true</enable-calendar>
+    <enable-addressbook>true</enable-addressbook>
+    <auto-schedule-mode>automatic</auto-schedule-mode>
+</record>
+""")
+
+out.write("""<record>
+    <uid>Default-Resource</uid>
+    <enable-calendar>true</enable-calendar>
+    <enable-addressbook>true</enable-addressbook>
+    <auto-schedule-mode>automatic</auto-schedule-mode>
+</record>
+""")
+
 for uid, settings in augments:
     elements = []
     for key, value in settings.iteritems():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140401/d4f89206/attachment.html>