[Checkins] SVN: Zope/trunk/ LP #143604: Removed top-level database-quota-size from zope.conf, some storages support a quota option instead.

[Hanno Schlichting]

Log message for revision 110468:
  LP #143604: Removed top-level database-quota-size from zope.conf, some storages support a quota option instead.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Zope2/Startup/handlers.py
  U   Zope/trunk/src/Zope2/Startup/zopeschema.xml
  U   Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-04-03 18:18:27 UTC (rev 110467)
+++ Zope/trunk/doc/CHANGES.rst	2010-04-03 18:30:01 UTC (rev 110468)
@@ -146,6 +146,9 @@
 Bugs Fixed
 ++++++++++
 
+- LP #143604: Removed top-level database-quota-size from zope.conf, some
+  storages support a quota option instead.
+
 - LP #143089: Removed the top-level zeo-client-name option from zope.conf, as
   it had no effect since ZODB 3.2.
 

Modified: Zope/trunk/src/Zope2/Startup/handlers.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/handlers.py	2010-04-03 18:18:27 UTC (rev 110467)
+++ Zope/trunk/src/Zope2/Startup/handlers.py	2010-04-03 18:30:01 UTC (rev 110468)
@@ -65,10 +65,6 @@
     value and _setenv('SUPPRESS_SITEROOT', value)
     return value
 
-def database_quota_size(value):
-    value and _setenv('ZOPE_DATABASE_QUOTA', value)
-    return value
-
 def structured_text_header_level(value):
     value is not None and _setenv('STX_DEFAULT_LEVEL', value)
     return value

Modified: Zope/trunk/src/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopeschema.xml	2010-04-03 18:18:27 UTC (rev 110467)
+++ Zope/trunk/src/Zope2/Startup/zopeschema.xml	2010-04-03 18:30:01 UTC (rev 110468)
@@ -772,18 +772,6 @@
      <metadefault>off</metadefault>
   </key>
 
-
-  <key name="database-quota-size" datatype="byte-size"
-       handler="database_quota_size">
-     <description>
-     Set this directive to an integer in bytes in order to place a hard
-     limit on the size which the default FileStorage-backed Zope database
-     can grow. Additions to the database will not be permitted once this
-     file size is exceeded.
-     </description>
-     <metadefault>unset</metadefault>
-  </key>
-
   <section type="eventlog" name="*" attribute="eventlog">
     <description>
       Describes what level of log output is desired and where it

Modified: Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in
===================================================================
--- Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in	2010-04-03 18:18:27 UTC (rev 110467)
+++ Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in	2010-04-03 18:30:01 UTC (rev 110468)
@@ -721,21 +721,6 @@
 #    suppress-all-site-roots on
 
 
-# Directive: database-quota-size
-#
-# Description:
-#     Set this directive to an integer in bytes in order to place a hard
-#     limit on the size which the default FileStorage-backed Zope database
-#     can grow. Additions to the database will not be permitted once this
-#     filesize is exceeded.
-#
-# Default: unset
-#
-# Example:
-#
-#    database-quota-size 1000000
-
-
 # Directives: logger
 #
 # Description: