Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
87fb9799
Commit
87fb9799
authored
Oct 20, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set defaults in proper place.
Also drop another legacy, as it was migrated to profile based idea.
parent
ca34ed84
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
32 deletions
+10
-32
software/erp5/instance.cfg
software/erp5/instance.cfg
+0
-10
software/erp5/snippet-master.cfg
software/erp5/snippet-master.cfg
+8
-0
software/erp5/software.cfg
software/erp5/software.cfg
+2
-11
stack/erp5.cfg
stack/erp5.cfg
+0
-11
No files found.
software/erp5/instance.cfg
View file @
87fb9799
[oldbuildout]
parts =
instance
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[instance]
[instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module}
rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
runTestSuite_binary = ${buildout:bin-directory}/runTestSuite
runTestSuite_binary = ${buildout:bin-directory}/runTestSuite
runUnitTest_binary = ${buildout:bin-directory}/runUnitTest
runUnitTest_binary = ${buildout:bin-directory}/runUnitTest
sphinx_searchd_binary = ${sphinx:location}/bin/searchd
sphinx_searchd_binary = ${sphinx:location}/bin/searchd
configurator_bt5_list = ${instance-recipe:configurator_bt5_list}
[buildout]
[buildout]
parts =
parts =
...
...
software/erp5/snippet-master.cfg
View file @
87fb9799
...
@@ -216,6 +216,8 @@ link-binary =
...
@@ -216,6 +216,8 @@ link-binary =
[erp5-update]
[erp5-update]
recipe = slapos.cookbook:erp5.update
recipe = slapos.cookbook:erp5.update
# Configuration
url = http://$${%(zope_section)s:user}:$${%(zope_section)s:password}@$${%(haproxy_section)s:ip}:$${%(haproxy_section)s:port}/
url = http://$${%(zope_section)s:user}:$${%(zope_section)s:password}@$${%(haproxy_section)s:ip}:$${%(haproxy_section)s:port}/
mysql-url = %(mysql-url)s
mysql-url = %(mysql-url)s
kumofs-url = %(kumofs-url)s
kumofs-url = %(kumofs-url)s
...
@@ -224,3 +226,9 @@ cloudooo-url = %(cloudooo-url)s
...
@@ -224,3 +226,9 @@ cloudooo-url = %(cloudooo-url)s
site-id = %(site_id)s
site-id = %(site_id)s
openssl-binary = ${openssl:location}/bin/openssl
openssl-binary = ${openssl:location}/bin/openssl
cadir-path = $${erp5-certificate-authority:ca-dir}
cadir-path = $${erp5-certificate-authority:ca-dir}
# Paths
update-wrapper = $${basedirectory:services}/erp5_update
# Defaults
configurator-bt5-list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
software/erp5/software.cfg
View file @
87fb9799
...
@@ -48,19 +48,10 @@ md5sum = 9ba8a7f8eb67c51979b38602bb6610b8
...
@@ -48,19 +48,10 @@ md5sum = 9ba8a7f8eb67c51979b38602bb6610b8
output = ${buildout:directory}/template-kumofs.cfg
output = ${buildout:directory}/template-kumofs.cfg
mode = 0644
mode = 0644
[instance-recipe]
# Note: In case if specific instantiation recipe is used this is the place to
# put its name
egg = slapos.cookbook
module = erp5
# Additional Configuration
configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
cc66de622bc770f745ead9316264ec3a
md5sum =
3292c82fd665264a9710a9cc8e260d64
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
...
@@ -88,7 +79,7 @@ mode = 0644
...
@@ -88,7 +79,7 @@ mode = 0644
[template-snippet-master]
[template-snippet-master]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-master.cfg
url = ${:_profile_base_location_}/snippet-master.cfg
md5sum =
538d6e58a1ac78a10084b78c90a3a98b
md5sum =
4180d09d23b3a04bad99d448a3f50bee
output = ${buildout:directory}/template-snippet-master.cfg
output = ${buildout:directory}/template-snippet-master.cfg
mode = 0644
mode = 0644
...
...
stack/erp5.cfg
View file @
87fb9799
...
@@ -29,9 +29,6 @@ allow-hosts =
...
@@ -29,9 +29,6 @@ allow-hosts =
www.dabeaz.com
www.dabeaz.com
www.owlfish.com
www.owlfish.com
develop =
/opt/slapdev
extends =
extends =
# Exact version of Zope
# Exact version of Zope
http://svn.zope.org/repos/main/Zope/tags/2.12.20/versions.cfg
http://svn.zope.org/repos/main/Zope/tags/2.12.20/versions.cfg
...
@@ -108,7 +105,6 @@ parts =
...
@@ -108,7 +105,6 @@ parts =
# Buildoutish
# Buildoutish
eggs
eggs
instance-recipe-egg
testrunner
testrunner
test_suite_runner
test_suite_runner
...
@@ -295,13 +291,6 @@ initialization =
...
@@ -295,13 +291,6 @@ initialization =
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.6
eggs =
# instantiation egg
${instance-recipe:egg}
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
python = python2.6
python = python2.6
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment