Commit 9282bac3 authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Tristan Cavelier

erp5: fix, add http monitor

parent 207f40d3
...@@ -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 =
......
{% 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 %}
...@@ -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'] }}
......
...@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment