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
francois
slapos
Commits
907fc369
Commit
907fc369
authored
Dec 16, 2014
by
Alain Takoudjou
Committed by
Tristan Cavelier
Mar 31, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: fix, add http monitor
parent
982cd491
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
8 deletions
+3
-8
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-1
stack/erp5/instance-http-monitor.cfg.in
stack/erp5/instance-http-monitor.cfg.in
+0
-5
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+0
-2
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+1
-0
No files found.
stack/erp5/buildout.cfg
View file @
907fc369
...
@@ -57,9 +57,9 @@ extends =
...
@@ -57,9 +57,9 @@ extends =
../../component/6tunnel/buildout.cfg
../../component/6tunnel/buildout.cfg
../../component/findutils/buildout.cfg
../../component/findutils/buildout.cfg
../../component/userhosts/buildout.cfg
../../component/userhosts/buildout.cfg
logrotate-base.cfg
../../stack/monitor/buildout.cfg
../../stack/monitor/buildout.cfg
../../component/pycurl/buildout.cfg
../../component/pycurl/buildout.cfg
logrotate-base.cfg
parts =
parts =
erp5-util-develop
erp5-util-develop
...
@@ -597,6 +597,7 @@ branch = erp5-cluster
...
@@ -597,6 +597,7 @@ branch = erp5-cluster
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
${lxml-python:egg}
${lxml-python:egg}
slapos.toolbox
slapos.toolbox[check_web_page_http_cache_hit,zodbpack]
slapos.toolbox[check_web_page_http_cache_hit,zodbpack]
scripts =
scripts =
...
...
stack/erp5/instance-http-monitor.cfg.in
View file @
907fc369
{% if software_type == slap_software_type -%}
[buildout]
[buildout]
parts =
parts =
certificate-authority
certificate-authority
...
@@ -22,9 +21,6 @@ parts =
...
@@ -22,9 +21,6 @@ parts =
extends = {{ parameter_dict["template-monitor"] }}
extends = {{ parameter_dict["template-monitor"] }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
[monitor-check-web-page-http-cache-hit]
[monitor-check-web-page-http-cache-hit]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = "{{ parameter_dict['bin-directory'] }}/check-web-page-http-cache-hit" -K "${public:filename}"
command-line = "{{ parameter_dict['bin-directory'] }}/check-web-page-http-cache-hit" -K "${public:filename}"
...
@@ -47,4 +43,3 @@ filename = ${public:filename}
...
@@ -47,4 +43,3 @@ filename = ${public:filename}
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
monitor-url = ${monitor-parameters:url}
monitor-url = ${monitor-parameters:url}
{% endif %}
stack/erp5/instance-zope.cfg.in
View file @
907fc369
...
@@ -351,8 +351,6 @@ bt5 = {{ dumps(slapparameter_dict['bt5']) }}
...
@@ -351,8 +351,6 @@ bt5 = {{ dumps(slapparameter_dict['bt5']) }}
bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
[buildout]
[buildout]
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
extends =
extends =
{{ logrotate_cfg }}
{{ logrotate_cfg }}
{{ parameter_dict['template-monitor'] }}
{{ parameter_dict['template-monitor'] }}
...
...
stack/erp5/instance.cfg.in
View file @
907fc369
...
@@ -204,3 +204,4 @@ mariadb = dynamic-template-mariadb:rendered
...
@@ -204,3 +204,4 @@ mariadb = dynamic-template-mariadb:rendered
balancer = dynamic-template-balancer:rendered
balancer = dynamic-template-balancer:rendered
zodb-zeo = dynamic-template-zeo:rendered
zodb-zeo = dynamic-template-zeo:rendered
zope = dynamic-template-zope:rendered
zope = dynamic-template-zope:rendered
http-monitor = dynamic-template-http-monitor:rendered
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