Commit 880ef279 authored by Gabriel Monnerat's avatar Gabriel Monnerat

don't overwrite instance.inc because it is not used to erp5 setup and is breaking this setup

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43591 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8c8ed5c4
...@@ -55,8 +55,8 @@ memory-limit = 3000 ...@@ -55,8 +55,8 @@ memory-limit = 3000
uno-path = ${software_definition:openoffice_software}/basis-link/program/ uno-path = ${software_definition:openoffice_software}/basis-link/program/
office-binary-path = ${software_definition:openoffice_software}/program/ office-binary-path = ${software_definition:openoffice_software}/program/
openoffice-port = 4062 openoffice-port = 4062
env-PATH = ${software_definition:xpdf-path} env-PATH = ${software_definition:software_home}/parts/xpdf/bin
env-LD_LIBRARY_PATH = ${software_definition:file-path} env-LD_LIBRARY_PATH = ${software_definition:software_home}/parts/file/lib
server-hostname = 0.0.0.0 server-hostname = 0.0.0.0
server-port = ${configuration:oood_port} server-port = ${configuration:oood_port}
supervisor-priority = 30 supervisor-priority = 30
......
...@@ -36,6 +36,7 @@ eggs = ...@@ -36,6 +36,7 @@ eggs =
[sources] [sources]
cloudooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo cloudooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo
erp5.recipe.cloudoooinstance = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/erp5.recipe.cloudoooinstance
[cloudooo] [cloudooo]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -53,15 +54,3 @@ eggs = ...@@ -53,15 +54,3 @@ eggs =
[software_definition] [software_definition]
software_home = ${buildout:directory} software_home = ${buildout:directory}
executable = ${python2.6:executable} executable = ${python2.6:executable}
[instance_template]
input = inline:
[buildout]
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[software_definition]
software_home = ${software_definition:software_home}
xpdf-path = ${xpdf:location}/bin
file-path = ${file:location}/lib
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