diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 47327b7c9dfe91be7c531b6513e685ce3355cf38..655b0e78878c42223c12ff3d8f0d7b2d0572e7d8 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -344,7 +344,7 @@ link-binary = [template-balancer] < = download-base filename = instance-balancer.cfg.in -md5sum = 796bcba17e4e8e7e86c2d1cf9a1e67dd +md5sum = 86131104949100316eece4bcae8ee1b8 [template-apache-conf] < = download-base diff --git a/stack/erp5/instance-balancer.cfg.in b/stack/erp5/instance-balancer.cfg.in index 74596c56278fab0fe78e208def0e53760453da43..6936b8abde75466c6673070e8e0dcb8d8b0c138e 100644 --- a/stack/erp5/instance-balancer.cfg.in +++ b/stack/erp5/instance-balancer.cfg.in @@ -144,6 +144,13 @@ recipe = slapos.cookbook:wrapper wrapper-path = ${directory:services}/apache 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] recipe = slapos.cookbook:publish.serialised {% for family_name, (apache_port, scheme, _) in apache_dict.items() -%} @@ -188,6 +195,7 @@ recipe = slapos.cookbook:mkdirectory apache-conf = ${:etc}/apache bin = ${buildout:directory}/bin etc = ${buildout:directory}/etc +promise = ${directory:etc}/promise services = ${:etc}/run var = ${buildout:directory}/var run = ${:var}/run