diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index c7394161e1ac04ff08c19e8cd4d45e4c4c6ebcab..9ee49f5ac7c9297385f91a52615b7c1c4533b990 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -26,11 +26,11 @@ md5sum = a6a626fd1579fd1d4b80ea67433ca16a [profile-caddy-replicate] filename = instance-apache-replicate.cfg.in -md5sum = b7eeb3268b32b9fceb9a6f3c248a7bbf +md5sum = cc1bf002818e95542ceaff5fa06d9546 [profile-slave-list] _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in -md5sum = e61477243ed7405b1d8b746287a8f03b +md5sum = c48c1be68d547540971f874e78e5c96d [profile-replicate-publish-slave-information] _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in diff --git a/software/caddy-frontend/instance-apache-replicate.cfg.in b/software/caddy-frontend/instance-apache-replicate.cfg.in index 0b4a693a236d28a72be3f0f891854b1baa41020e..0f1dde737a4861b18e5ec89eba156aca0a47a60b 100644 --- a/software/caddy-frontend/instance-apache-replicate.cfg.in +++ b/software/caddy-frontend/instance-apache-replicate.cfg.in @@ -270,7 +270,7 @@ config-monitor-username = ${monitor-instance-parameter:username} config-monitor-password = ${monitor-htpasswd:passwd} software-type = {{frontend_type}} -return = private-ipv4 slave-instance-information-list monitor-base-url backend-client-csr_id-url csr_id-url csr_id-certificate backend-haproxy-statistic-url +return = slave-instance-information-list monitor-base-url backend-client-csr_id-url csr_id-url csr_id-certificate backend-haproxy-statistic-url {#- Send only needed parameters to frontend nodes #} {%- set base_node_configuration_dict = {} %} diff --git a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in index a23f4216bec2025bd54a462c81fb8050a18e3cf1..8a2aa7ccbdb318fd36519e281d9e0c26a8991c88 100644 --- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in +++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in @@ -434,7 +434,6 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg {#- Publish information for the instance #} [publish-caddy-information] recipe = slapos.cookbook:publish.serialised -private-ipv4 = {{ instance_parameter_dict['ipv4-random'] }} {%- if configuration['extra_slave_instance_list'] %} {#- sort_keys are important in order to avoid shuffling parameters on each run #} slave-instance-information-list = {{ json_module.dumps(slave_instance_information_list, sort_keys=True) }}