Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
e5206812
Commit
e5206812
authored
Jul 02, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scalability: fix requests param name
parent
3c748e0a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-scalability.cfg.in
stack/erp5/instance-scalability.cfg.in
+8
-10
No files found.
stack/erp5/buildout.cfg
View file @
e5206812
...
...
@@ -329,7 +329,7 @@ md5sum = 0ff7b686c7a3ad58e736cb09207c7f01
[template-scalability]
< = download-base
filename = instance-scalability.cfg.in
md5sum =
0f2f7b54e17feb9bef2479cc6397a790
md5sum =
87faf70feb657c89a6be0b94551946a5
[template-zeo]
< = download-base
...
...
stack/erp5/instance-scalability.cfg.in
View file @
e5206812
...
...
@@ -2,7 +2,7 @@
{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
{% set promise_path = slapparameter_dict.get('promise-path', 'erp5') -%}
[buildout]
extends =
{{ template_zope }}
extends =
parts =
erp5-cluster
binary-wrap-launcher
...
...
@@ -34,7 +34,7 @@ config =
${:extra-config}
extra-config =
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
return = mariadb-url family-
user
return = mariadb-url family-
scalability-site_url kumofs-url memcached-url cloudooo-url
# Create wrapper
...
...
@@ -90,21 +90,19 @@ bin = ${buildout:directory}/bin
[erp5-bootstrap]
recipe = slapos.cookbook:erp5.bootstrap
runner-path = ${basedirectory:services}/erp5-bootstrap
mysql-url = ${erp5-cluster:connection-mariadb-url}
zope-url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/{{ site_id }}
zope-url =
zope-url = ${erp5-cluster:site_url}/{{ site_id }}
[erp5-promise]
recipe = slapos.cookbook:erp5.promise
promise-path = {{ promise_path }}
kumofs-url = ${
request-kumofs:connection
-url}
memcached-url = ${
request-memcached:connection
-url}
cloudooo-url = ${
request-cloudooo:connection
-url}
kumofs-url = ${
erp5-cluster:connection-kumofs
-url}
memcached-url = ${
erp5-cluster:connection-memcached
-url}
cloudooo-url = ${
erp5-cluster:connection-cloudooo
-url}
smtp-url =
bt5 =
bt5-repository-url =
...
...
@@ -116,7 +114,7 @@ site-id = {{ site_id }}
[promise-erp5-site]
recipe = slapos.cookbook:check_url_available
path = ${basedirectory:promises}/erp5site
url =
http://${zope-instance:ip}:${zope-instance:port
}/{{ site_id }}
url =
${erp5-cluster:site_url
}/{{ site_id }}
dash_path = {{ dash_location }}/bin/dash
curl_path = {{ curl_location }}/bin/curl
...
...
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