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
Romain Courteaud
slapos
Commits
26fe60f9
Commit
26fe60f9
authored
Apr 05, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5.balancer: Add promise checking apache started.
parent
f2183d38
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+8
-0
No files found.
stack/erp5/buildout.cfg
View file @
26fe60f9
...
@@ -344,7 +344,7 @@ link-binary =
...
@@ -344,7 +344,7 @@ link-binary =
[template-balancer]
[template-balancer]
< = download-base
< = download-base
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
796bcba17e4e8e7e86c2d1cf9a1e67dd
md5sum =
86131104949100316eece4bcae8ee1b8
[template-apache-conf]
[template-apache-conf]
< = download-base
< = download-base
...
...
stack/erp5/instance-balancer.cfg.in
View file @
26fe60f9
...
@@ -144,6 +144,13 @@ recipe = slapos.cookbook:wrapper
...
@@ -144,6 +144,13 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:services}/apache
wrapper-path = ${directory:services}/apache
command-line = "{{ parameter_dict['apache'] }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
command-line = "{{ parameter_dict['apache'] }}/bin/httpd" -f "${apache-conf:rendered}" -DFOREGROUND
[{{ section('apache-promise') }}]
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/apache
hostname = {{ ipv4 }}
port = {{ apache_dict.values()[0][0] }}
[publish]
[publish]
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
{% for family_name, (apache_port, scheme, _) in apache_dict.items() -%}
{% for family_name, (apache_port, scheme, _) in apache_dict.items() -%}
...
@@ -188,6 +195,7 @@ recipe = slapos.cookbook:mkdirectory
...
@@ -188,6 +195,7 @@ recipe = slapos.cookbook:mkdirectory
apache-conf = ${:etc}/apache
apache-conf = ${:etc}/apache
bin = ${buildout:directory}/bin
bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
promise = ${directory:etc}/promise
services = ${:etc}/run
services = ${:etc}/run
var = ${buildout:directory}/var
var = ${buildout:directory}/var
run = ${:var}/run
run = ${:var}/run
...
...
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