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
Cédric Le Ninivin
slapos
Commits
5962ee8d
Commit
5962ee8d
authored
Jun 11, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use slapos.buildout "dumps" to pass python list to zope.conf.in template.
parent
c2dae992
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
6 deletions
+5
-6
software/erp5/instance-tidstorage.cfg.in
software/erp5/instance-tidstorage.cfg.in
+1
-2
software/erp5/software.cfg
software/erp5/software.cfg
+2
-2
software/erp5/zope.conf.in
software/erp5/zope.conf.in
+1
-1
stack/erp5.cfg
stack/erp5.cfg
+1
-1
No files found.
software/erp5/instance-tidstorage.cfg.in
View file @
5962ee8d
...
...
@@ -336,7 +336,7 @@ recipe = slapos.cookbook:pwgen.stable
[zope-conf-parameter-base]
ip = {{ ipv4 }}
site-id = {{ site_id }}
zodb-list = {{
json_module.
dumps(zodb_connection_list) }}
zodb-list = {{ dumps(zodb_connection_list) }}
[zope-conf-base]
recipe = slapos.recipe.template:jinja2
...
...
@@ -347,7 +347,6 @@ context =
key instance_products directory:instance-products
raw deadlock_path /manage_debug_threads
key deadlock_debugger_password deadlock-debugger-password:password
import json_module json
key tidstorage_ip tidstorage:ip
key tidstorage_port tidstorage:port
key promise_path erp5-promise:promise-path
...
...
software/erp5/software.cfg
View file @
5962ee8d
...
...
@@ -111,7 +111,7 @@ extra-context =
[template-tidstorage]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum = 5
c52385b4f12fd9719975655bc2eddec
md5sum = 5
20e39f2612a045b42c0ad914bfdc5a9
mode = 640
[template-cloudooo]
...
...
@@ -126,7 +126,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
[template-zope-conf]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/zope.conf.in
md5sum =
ec4203f1f54b05505d8f35cb5799a75c
md5sum =
599e004c18fd3461aa846ae75bd112f2
mode = 640
[template]
...
...
software/erp5/zope.conf.in
View file @
5962ee8d
...
...
@@ -80,7 +80,7 @@ products {{ instance_products }}
container-class Products.TemporaryFolder.TemporaryContainer
</zodb_db>
{% for db_name, mount_point, cache_size, storage_type, storage_dict in
json_module.loads(parameter_dict['zodb-list'])
-%}
{% for db_name, mount_point, cache_size, storage_type, storage_dict in
parameter_dict['zodb-list']
-%}
<zodb_db {{ db_name }}>
{%- if cache_size %}
cache-size {{ cache_size }}
...
...
stack/erp5.cfg
View file @
5962ee8d
...
...
@@ -482,7 +482,7 @@ rtjp-eventlet = 0.3.2
setuptools = 0.6c12dev-r88846
slapos.core = 0.24
slapos.recipe.build = 0.7
slapos.recipe.template = 2.
3
slapos.recipe.template = 2.
4
slapos.toolbox = 0.23
smmap = 0.8.2
socketpool = 0.3.0
...
...
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