Monitor instance added to erp5 cluster

stack/erp5/buildout.cfg

@@ -66,6 +66,7 @@ extends =
   ../../component/jsl/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/findutils/buildout.cfg
+  ../../stack/monitor/buildout.cfg
 
 parts =
   rdiff-backup
@@ -174,6 +175,11 @@ context =
     key slapos_core_version versions:slapos.core
     ${:extra-context}
 
+[template-http-monitor]
+< = download-base
+filename = instance-http-monitor.cfg.in
+md5sum = b57272c05d47ff55d4473dbed323ae12
+
 [template-mariadb]
 < = download-base
 filename = instance-mariadb.cfg.in
@@ -230,7 +236,7 @@ md5sum = ba1b23177e101b5b9f03e1c5009c81fc
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ed053189e234a27f0b2f2b8b53c532bf
+md5sum = f73cce70701c9dd67fe5881f2799d467
 extra-context =
     key mariadb_link_binary template-mariadb:link-binary
     key zope_link_binary template-zope:link-binary
@@ -280,6 +286,7 @@ extra-context =
     key template_create_erp5_site_real template-create-erp5-site-real:target
     key template_erp5 template-erp5:target
     key template_haproxy_cfg template-haproxy-cfg:target
+    key template_http_monitor template-http-monitor:target
     key template_kumofs template-kumofs:target
     key template_logrotate_base template-logrotate-base:rendered
     key template_mariadb template-mariadb:target
@@ -295,7 +302,7 @@ extra-context =
 [template-erp5]
 < = download-base
 filename = instance-erp5.cfg.in
-md5sum = 66c338cd82c89a3217f4576429661a51
+md5sum = 4afd0d660c67714d01c3c519c549eed0
 
 [template-neo]
 < = download-base

stack/erp5/instance-erp5.cfg.in

@@ -46,6 +46,7 @@ config-{{ option }} = {{ dumps(value) }}
 {# Fail early if an unexpected value is provided -#}
 {% set possible_software_type_dict = {'zeo': 'zeo', 'neo': 'neo'} -%}
 {{ request('zodb', 'zodb-' ~ possible_software_type_dict[slapparameter_dict.get('zodb-software-type', 'zeo')], 'zodb', {'tcpv4-port': 2100, 'zodb-dict': {'root': {}}}, {'zodb-storage-type': False, 'zodb-dict': False, 'tidstorage-ip': False, 'tidstorage-port': False}) }}
+{{ request('http-monitor', 'http-monitor', 'http-monitor', {}) }}
 
 [inituser-password]
 {% set inituser_password = slapparameter_dict.get('inituser-password') -%}

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

+{% if software_type == slap_software_type -%}
+[buildout]
+parts =
+  certificate-authority
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-index
+  deploy-settings-cgi
+  deploy-status-cgi
+  setup-static-files
+  certificate-authority
+  zero-parameters
+  public-symlink
+  cgi-httpd-wrapper
+  cgi-httpd-graceful-wrapper
+  monitor-promise
+  monitor-instance-log-access
+
+extends = ${monitor-template:output}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+{% endif %}

stack/erp5/instance.cfg.in

@@ -211,6 +211,13 @@ extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type create-erp5-site
 
+[dynamic-template-http-monitor]
+< = jinja2-template-base
+template = {{ template_http_monitor }}
+filename = instance-http-monitor.cfg
+extra-context =
+    raw software_type http-monitor
+
 [switch-softwaretype]
 recipe = slapos.recipe.build
 script =
@@ -250,3 +257,4 @@ balancer = ${dynamic-template-balancer:rendered}
 zodb-neo = ${dynamic-template-neo:rendered}
 zodb-zeo = ${dynamic-template-zeo:rendered}
 zope = ${dynamic-template-zope:rendered}
+http-monitor = ${dynamic-template-http-monitor:rendered}