[CalendarServer-changes] [1242] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1242
          http://trac.macosforge.org/projects/calendarserver/changeset/1242
Author:   wsanchez at apple.com
Date:     2007-02-22 18:45:43 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
s/Bytes//

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test-logged.plist
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/twistedcaldav/admin/options.py
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/conf/caldavd-test-logged.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 02:38:35 UTC (rev 1241)
+++ CalendarServer/trunk/conf/caldavd-test-logged.plist	2007-02-23 02:45:43 UTC (rev 1242)
@@ -148,10 +148,10 @@
   </dict>
   -->
   
-  <key>MaximumAttachmentSizeBytes</key>
+  <key>MaximumAttachmentSize</key>
   <integer>1048576</integer><!-- 1Mb -->
 
-  <key>UserQuotaBytes</key>
+  <key>UserQuota</key>
   <integer>104857600</integer><!-- 100Mb -->
 
   <key>DropBoxEnabled</key>

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 02:38:35 UTC (rev 1241)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2007-02-23 02:45:43 UTC (rev 1242)
@@ -154,10 +154,10 @@
   </dict>
   -->
   
-  <key>MaximumAttachmentSizeBytes</key>
+  <key>MaximumAttachmentSize</key>
   <integer>1048576</integer><!-- 1Mb -->
 
-  <key>UserQuotaBytes</key>
+  <key>UserQuota</key>
   <integer>104857600</integer><!-- 100Mb -->
 
   <key>DropBoxEnabled</key>

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2007-02-23 02:38:35 UTC (rev 1241)
+++ CalendarServer/trunk/conf/caldavd.plist	2007-02-23 02:45:43 UTC (rev 1242)
@@ -102,10 +102,10 @@
     </dict>
   </dict>
   
-  <key>MaximumAttachmentSizeBytes</key>
+  <key>MaximumAttachmentSize</key>
   <integer>1048576</integer><!-- 1Mb -->
 
-  <key>UserQuotaBytes</key>
+  <key>UserQuota</key>
   <integer>104857600</integer><!-- 100Mb -->
 
   <key>DropBoxEnabled</key>

Modified: CalendarServer/trunk/twistedcaldav/admin/options.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/options.py	2007-02-23 02:38:35 UTC (rev 1241)
+++ CalendarServer/trunk/twistedcaldav/admin/options.py	2007-02-23 02:45:43 UTC (rev 1242)
@@ -158,7 +158,7 @@
 
     def __init__(self):
         SubCommand.__init__(self)
-        self['quota'] = config.UserQuotaBytes
+        self['quota'] = config.UserQuota
 
     def postOptions(self):
         report = reflect.namedAny(self.action)(self, self.name).run()

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 02:38:35 UTC (rev 1241)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-02-23 02:45:43 UTC (rev 1242)
@@ -48,8 +48,8 @@
     # Data store
     #
     "DocumentRoot": "/Library/CalendarServer/Documents",
-    "UserQuotaBytes": 104857600,
-    "MaximumAttachmentSizeBytes": 1048576,
+    "UserQuota": 104857600,           # User quota (in bytes)
+    "MaximumAttachmentSize": 1048576, # Attachment size limit (in bytes)
 
     #
     # Directory service

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070222/93ad1366/attachment.html