- put a lot of Zope configuration defaults in instance-profiles/zope.cfg

 - use new way of configuring instance by using template


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32678 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/development.cfg

@@ -11,21 +11,27 @@ parts +=
 [zope-instance]
 recipe = erp5.recipe.standaloneinstance
 zope2-location = ${software_definition:zope_software}
-debug-mode = on
-location = ${buildout:var-directory}/zope-instance
 
-eggs +=
-  Products.ExternalEditor
+# developer by default want to have updatable Data.fs
+force-zodb-update = false
 
+# zope.conf template part BEGIN
+debug-mode = on
+instancehome = ${buildout:var-directory}/zope-instance
 # until we will have more control over products we need to redefine to insert
 # local products to be able to override
 products =
-  ${:location}/Products/
-  ${cmf15:location}/CMF/
-  ${products-deps:location}
-  ${products-erp5:location}
-  ${products-other:location}
-  ${products-development:location}
+  products ${:instancehome}/Products/
+  products ${cmf15:location}/CMF/
+  products ${products-deps:location}
+  products ${products-erp5:location}
+  products ${products-other:location}
+  products ${products-development:location}
+# zope.conf template part ENDS
+
+eggs +=
+  Products.ExternalEditor
+
 
 # modify this to reflect your local mysql configuration
 # Format:

buildout/instance-profiles/zope.cfg

@@ -8,26 +8,79 @@ depends = ${create_mysql_database:command}
 recipe = erp5.recipe.standaloneinstance
 zope2-location = ${software_definition:zope_software}
 user = zope:zope
-http-address = 18080
-debug-mode = off
-#Only for zope2.8
-default-zpublisher-encoding = 
-zope-conf-additional=
-  %import timerserver
-  <timer-server>
-    interval 5
-  </timer-server>
 
 eggs = ${eggs:eggs}
-products =
-  ${cmf15:location}/CMF/
-  ${products-deps:location}
-  ${products-erp5:location}
-  ${products-other:location}
+
+zope_conf_template =
+  ${buildout:directory}/templates/default-erp5-standalone-zope.conf.in
 
 portal_id = erp5
 bt5-path = ${bt5-erp5:location}
 bt5 =
+force-zodb-update = false
+# zope.conf template part BEGIN
+# User modifable keys:
+products =
+  products ${cmf15:location}/CMF/
+  products ${products-deps:location}
+  products ${products-erp5:location}
+  products ${products-other:location}
+environment =
+debug-mode = off
+ip-address = 0.0.0.0
+http-address = 18080
+# Good defaults, which do not have to be touch:
+clienthome = ${:instancehome}/var
+lib_path = ${:instancehome}/lib/python
+effective-user =
+enable-product-installation = on
+locale =
+datetime-format = us
+zserver-threads = 4
+python-check-interval = 500
+zserver-read-only-mode = off
+pid-filename = ${:clienthome}/Z2.pid
+lock-filename = ${:clienthome}/Z2.lock
+mime-types =
+structured-text-header-level = 3
+rest-input-encoding =
+rest-output-encoding =
+rest-header-level = 3
+rest-language-code = en
+cgi-environment =
+dns-server =
+http-realm = Zope
+cgi-maxlen = 0
+http-header-max-length = 8192
+automatically-quote-dtml-request-data = on
+trusted-proxy =
+publisher-profile-file =
+security-policy-implementation = C
+skip-authentication-checking = off
+skip-ownership-checking = off
+verbose-security = off
+maximum-number-of-session-objects = 1000
+session-add-notify-script-path =
+session-delete-notify-script-path =
+session-timeout-minutes = 20
+session-resolution-seconds = 20
+suppress-all-access-rules = off
+suppress-all-site-roots = off
+database-quota-size =
+read-only-database = off
+eventlog-level = info
+eventlog-path = ${:instancehome}/log/event.log
+access-level = WARN
+access-path = ${:instancehome}/log/Z2.log
+access-format = %(message)s
+warnfilter =
+max-listen-sockets = 100
+port-base = 0
+large-file-threshold =
+default-zpublisher-encoding = utf8
+http-force-connection-close = off
+zodb-path = ${:instancehome}/var/Data.fs
+# zope.conf template part ENDS
 
 [create_mysql_database]
 # XXX: This have to be converted into recipe