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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos
Commits
4ef9c28f
Commit
4ef9c28f
authored
Oct 19, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge haproxy into snippet-backend
parent
e56d72af
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
60 deletions
+15
-60
software/erp5/instance-haproxy.cfg
software/erp5/instance-haproxy.cfg
+0
-49
software/erp5/instance.cfg
software/erp5/instance.cfg
+0
-1
software/erp5/snippet-backend.cfg
software/erp5/snippet-backend.cfg
+13
-0
software/erp5/software.cfg
software/erp5/software.cfg
+2
-10
No files found.
software/erp5/instance-haproxy.cfg
deleted
100644 → 0
View file @
e56d72af
#############################
#
# Instanciate haproxy
#
# haproxy-id -- local id of the requested haproxy (login, web,...)
#
# haproxy-port -- ip port to use to run the process
#
# maxconn -- max connection per server
#
# site-id -- ID of the ERP5 site object in ZODB
#
# storage_list -- string with list of all resquested storage
# Example: event_module person_module
#
#############################
[buildout]
parts =
haproxy-instance
publish-haproxy-connection-information
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc/
[basedirectory]
recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run/
[haproxy-instance]
recipe = slapos.cookbook:haproxy
name = $${slap-parameter:haproxy-id}
conf-path = $${rootdirectory:etc}/haproxy-$${slap-parameter:haproxy-id}.cfg
ip = $${slap-network-information:local-ipv4}
port = $${slap-parameter:haproxy-port}
maxconn = $${slap-parameter:maxconn}
server-check-path = /$${slap-parameter:site-id}/getId
wrapper-path = $${basedirectory:services}/haproxy_$${slap-parameter:haproxy-id}
binary-path = ${memcached:location}/bin/memcached
[publish-haproxy-connection-information]
recipe = slapos.cookbook:publishurl
url = http://$${haproxy-instance:ip}:$${haproxy-instance:port}/
software/erp5/instance.cfg
View file @
4ef9c28f
...
...
@@ -76,7 +76,6 @@ memcached = ${template-memcached:output}
cloudooo = ${template-cloudooo:output}
zope = ${template-zope:output}
mariadb = ${template-mariadb:output}
haproxy = ${template-haproxy:output}
tidstorage = $${dynamic-template-tidstorage:output}
[slap-connection]
...
...
software/erp5/snippet-backend.cfg
View file @
4ef9c28f
...
...
@@ -33,3 +33,16 @@ post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance
sharedscripts = true
notifempty = true
create = true
[haproxy-instance]
recipe = slapos.cookbook:haproxy
name = $${slap-parameter:haproxy-id}
conf-path = $${rootdirectory:etc}/haproxy-$${slap-parameter:haproxy-id}.cfg
ip = $${slap-network-information:local-ipv4}
port = $${slap-parameter:haproxy-port}
maxconn = $${slap-parameter:maxconn}
server-check-path = /$${slap-parameter:site-id}/getId
wrapper-path = $${basedirectory:services}/haproxy_$${slap-parameter:haproxy-id}
binary-path = ${memcached:location}/bin/memcached
software/erp5/software.cfg
View file @
4ef9c28f
...
...
@@ -12,7 +12,6 @@ parts +=
template-cloudooo
template-zope
template-mariadb
template-haproxy
template
validator
...
...
@@ -49,13 +48,6 @@ md5sum = d8a4a1976f4d22fae0668be0543438cc
output = ${buildout:directory}/template-kumofs.cfg
mode = 0644
[template-haproxy]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-haproxy.cfg
md5sum = ba2b358bc65c69533761fef8662cca30
output = ${buildout:directory}/template-haproxy.cfg
mode = 0644
[instance-recipe]
# Note: In case if specific instantiation recipe is used this is the place to
# put its name
...
...
@@ -68,7 +60,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
[template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum =
2ad8b538cb3c812f497cdba7116d0d6a
md5sum =
52f3c27de3e9e5f9223084829c3ed2f6
output = ${buildout:directory}/template.cfg
mode = 0644
...
...
@@ -110,7 +102,7 @@ mode = 0644
[template-snippet-backend]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-backend.cfg
md5sum =
8105ea278fc00549a4f5a12eba14cae0
md5sum =
50963d43711c1f928841b844d38b7286
output = ${buildout:directory}/template-snippet-backend.cfg
mode = 0644
...
...
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