erp5: fix, add http monitor

stack/erp5/buildout.cfg

@@ -57,9 +57,9 @@ extends =
   ../../component/6tunnel/buildout.cfg
   ../../component/findutils/buildout.cfg
   ../../component/userhosts/buildout.cfg
-  logrotate-base.cfg
   ../../stack/monitor/buildout.cfg
   ../../component/pycurl/buildout.cfg
+  logrotate-base.cfg
 
 parts =
   erp5-util-develop
@@ -597,6 +597,7 @@ branch = erp5-cluster
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
+  slapos.toolbox
   slapos.toolbox[check_web_page_http_cache_hit,zodbpack]
 
 scripts =

stack/erp5/instance-http-monitor.cfg.in

-{% if software_type == slap_software_type -%}
 [buildout]
 parts =
   certificate-authority
@@ -22,9 +21,6 @@ parts =
 
 extends = {{ parameter_dict["template-monitor"] }}
 
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-
 [monitor-check-web-page-http-cache-hit]
 recipe = slapos.cookbook:wrapper
 command-line = "{{ parameter_dict['bin-directory'] }}/check-web-page-http-cache-hit" -K "${public:filename}"
@@ -47,4 +43,3 @@ filename = ${public:filename}
 recipe = slapos.cookbook:publish.serialised
 monitor-url = ${monitor-parameters:url}
 
-{% endif %}

stack/erp5/instance-zope.cfg.in

@@ -351,8 +351,6 @@ bt5 = {{ dumps(slapparameter_dict['bt5']) }}
 bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
 
 [buildout]
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
 extends =
   {{ logrotate_cfg }}
   {{ parameter_dict['template-monitor'] }}

stack/erp5/instance.cfg.in

@@ -204,3 +204,4 @@ mariadb = dynamic-template-mariadb:rendered
 balancer = dynamic-template-balancer:rendered
 zodb-zeo = dynamic-template-zeo:rendered
 zope = dynamic-template-zope:rendered
+http-monitor = dynamic-template-http-monitor:rendered