Commit 005cf6b3 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

good-bye erp5.recipe.standalone. use erp5.recipe.zope2instance instead.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41256 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e8478b9b
...@@ -3,82 +3,13 @@ ...@@ -3,82 +3,13 @@
parts = zope-instance parts = zope-instance
[zope-instance-template] [zope-instance-template]
recipe = erp5.recipe.standaloneinstance recipe = erp5.recipe.zope2instance
user = zope:zope user = zope:zope
environment-vars =
# empty bt5 by default PATH ${software_definition:software_home}/parts/imagemagick/bin:${software_definition:software_home}/parts/w3m/bin:${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/ghostscript/bin:${software_definition:software_home}/parts/pdftk/bin:${software_definition:software_home}/parts/file/bin:${software_definition:software_home}/parts/graphviz/bin
bt5 = zope-conf-additional =
bt5-path = # Use the clock-server to trigger the TimerService
<clock-server>
# modify this to reflect your local mysql configuration method /Control_Panel/timer_service/process_timer?interval:int=5
# Format: period 5
# database[@host[:port]] [user [password [unix_socket]]] </clock-server>
# e.g "erp5db erp5user somepassword" or "erp5db erp5user"
erp5_sql_connection_string = ${:mysql_database_name}@${:mysql_host}:${:mysql_port} ${:mysql_user} ${:mysql_password}
zope_conf_template =
${software_definition:software_home}/parts/erp5-zope2.12-template/template.in
portal_id = erp5
force-zodb-update = false
# zope.conf template part BEGIN
# instancehome and http-address have to be defined
# User modifable keys:
environment =
<environment>
PATH ${software_definition:software_home}/parts/imagemagick/bin:${software_definition:software_home}/parts/w3m/bin:${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/ghostscript/bin:${software_definition:software_home}/parts/pdftk/bin:${software_definition:software_home}/parts/file/bin:${software_definition:software_home}/parts/graphviz/bin
</environment>
debug-mode = off
ip-address = 0.0.0.0
# Good defaults, which do not have to be touched:
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 = on
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
...@@ -2,83 +2,14 @@ ...@@ -2,83 +2,14 @@
# be instaciated by another recipe. # be instaciated by another recipe.
[zope-instance-template] [zope-instance-template]
recipe = erp5.recipe.standaloneinstance recipe = erp5.recipe.zope2instance
zope2-location = ${software_definition:zope_software} zope2-location = ${software_definition:zope_software}
user = zope:zope user = zope:zope
environment-vars =
# empty bt5 by default PATH ${software_definition:software_home}/parts/imagemagick/bin:${software_definition:software_home}/parts/w3m/bin:${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/ghostscript/bin:${software_definition:software_home}/parts/pdftk/bin:${software_definition:software_home}/parts/file/bin:${software_definition:software_home}/parts/graphviz/bin
bt5 = zope-conf-additional =
bt5-path = # Timeserver to have ticks in zope
%import timerserver
# modify this to reflect your local mysql configuration <timer-server>
# Format: interval ${timer-server-interval}
# database[@host[:port]] [user [password [unix_socket]]] </timer-server>
# e.g "erp5db erp5user somepassword" or "erp5db erp5user"
erp5_sql_connection_string = ${:mysql_database_name}@${:mysql_host}:${:mysql_port} ${:mysql_user} ${:mysql_password}
zope_conf_template =
${buildout:directory}/templates/default-erp5-standalone-zope.conf.in
portal_id = erp5
force-zodb-update = false
# zope.conf template part BEGIN
# instancehome and http-address have to be defined
# User modifable keys:
environment =
<environment>
PATH ${software_definition:software_home}/parts/imagemagick/bin:${software_definition:software_home}/parts/w3m/bin:${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/ghostscript/bin:${software_definition:software_home}/parts/pdftk/bin:${software_definition:software_home}/parts/file/bin:${software_definition:software_home}/parts/graphviz/bin
</environment>
debug-mode = off
ip-address = 0.0.0.0
# Good defaults, which do not have to be touched:
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 = on
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
...@@ -12,3 +12,6 @@ Products.DCWorkflow = 2.2.1nxd001 ...@@ -12,3 +12,6 @@ Products.DCWorkflow = 2.2.1nxd001
# 1.0.3 fixes bug https://bugs.launchpad.net/zelenium/+bug/673610 # 1.0.3 fixes bug https://bugs.launchpad.net/zelenium/+bug/673610
Products.Zelenium >= 1.0.3 Products.Zelenium >= 1.0.3
# erp5.recipe.zope2instance 1.x is for Zope-2.8
erp5.recipe.zope2instance >= 2.0
...@@ -17,7 +17,6 @@ z3c.recipe.openoffice = 0.3.1dev2 ...@@ -17,7 +17,6 @@ z3c.recipe.openoffice = 0.3.1dev2
# requested # requested
erp5.recipe.mysqlserver >= 1.1.3 erp5.recipe.mysqlserver >= 1.1.3
erp5.recipe.sphinxserver >= 1.0.2 erp5.recipe.sphinxserver >= 1.0.2
erp5.recipe.standaloneinstance >= 0.4.4
hexagonit.recipe.cmmi >= 1.3.1 hexagonit.recipe.cmmi >= 1.3.1
python-memcached >= 1.45 python-memcached >= 1.45
xml-marshaller >= 0.9.2 xml-marshaller >= 0.9.2
......
...@@ -5,13 +5,17 @@ extends = ../profiles/versions-common.cfg ...@@ -5,13 +5,17 @@ extends = ../profiles/versions-common.cfg
[versions] [versions]
# 0.20.8 is the latest version of itools that works with python-2.4. # 0.20.8 is the latest version of itools that works with python-2.4.
itools = 0.20.8 itools = 0.20.8
# we sometimes have troubles with downloading alpha/beta version of # we sometimes have troubles with downloading alpha/beta version of
# lxml, and this is the lates stable version. # lxml, and this is the lates stable version.
lxml = 2.2.8 lxml = 2.2.8
# official pysvn egg does not work with zc.recipe.egg, so we use our # official pysvn egg does not work with zc.recipe.egg, so we use our
# modified version # modified version
#pysvn = 1.7.2 #pysvn = 1.7.2
# zc.recipe.egg is pinned as this is known compatible versions with # zc.recipe.egg is pinned as this is known compatible versions with
zc.recipe.egg = 1.2.2 zc.recipe.egg = 1.2.2
# plone.recipe.zope2instance 4.x is for Zope-2.12 or later
plone.recipe.zope2instance = 3.6 # erp5.recipe.zope2instance 2.x is for Zope-2.12 or later
erp5.recipe.zope2instance = 1.3.1
...@@ -149,8 +149,8 @@ eggs = ...@@ -149,8 +149,8 @@ eggs =
erp5.recipe.mysqlserver erp5.recipe.mysqlserver
erp5.recipe.ooodinstance erp5.recipe.ooodinstance
erp5.recipe.sphinxserver erp5.recipe.sphinxserver
erp5.recipe.standaloneinstance
erp5.recipe.testrunner erp5.recipe.testrunner
erp5.recipe.zope2instance
plone.recipe.command plone.recipe.command
plone.recipe.zeoserver plone.recipe.zeoserver
plone.recipe.zope2instance plone.recipe.zope2instance
......
...@@ -135,11 +135,10 @@ eggs = ...@@ -135,11 +135,10 @@ eggs =
erp5.recipe.mysqlserver erp5.recipe.mysqlserver
erp5.recipe.ooodinstance erp5.recipe.ooodinstance
erp5.recipe.sphinxserver erp5.recipe.sphinxserver
erp5.recipe.standaloneinstance
erp5.recipe.testrunner erp5.recipe.testrunner
erp5.recipe.zope2instance
plone.recipe.command plone.recipe.command
plone.recipe.zeoserver plone.recipe.zeoserver
plone.recipe.zope2instance
supervisor supervisor
z3c.recipe.mkdir z3c.recipe.mkdir
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment