diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 79220604fb1f8756ccc300992ec1b7e6c869f927..250b7d8547f492ad6eef2e714215ab565a8c9ea3 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -34,7 +34,7 @@ md5sum = aba91817a1b58377597500f676603d23 [profile-master-publish-slave-information] filename = instance-master-publish-slave-information.cfg.in -md5sum = b3422f3624054f57b78d0e50a0de399a +md5sum = e03eef8feee481256928a0e9249642c5 [template-caddy-frontend-configuration] _update_hash_filename_ = templates/Caddyfile.in diff --git a/software/caddy-frontend/instance-master-publish-slave-information.cfg.in b/software/caddy-frontend/instance-master-publish-slave-information.cfg.in index 450ce6123d930201c77da1ee04d53ddf09eb412b..c43f8f9342e2f4c349cabc74898b260e0fe0f8fe 100644 --- a/software/caddy-frontend/instance-master-publish-slave-information.cfg.in +++ b/software/caddy-frontend/instance-master-publish-slave-information.cfg.in @@ -52,6 +52,11 @@ {% endif %} {% endfor %} +[common-frontend-information] +{% for frontend_key, frontend_value in frontend_information.items() %} +{{ frontend_key }} = {{ frontend_value }} +{% endfor %} + # Publish information for each slave {% set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %} {% for slave_reference, slave_information in slave_information_dict.items() %} @@ -61,6 +66,7 @@ {% set publish_section_title = 'publish-%s' % slave_reference %} {% do part_list.append(publish_section_title) %} [{{ publish_section_title }}] +<= common-frontend-information recipe = slapos.cookbook:publish -slave-reference = {{ slave_reference }} {% set log_access_url = slave_information.pop('log-access-urls', None) %} @@ -72,9 +78,6 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }} {{ key }} = {{ dumps(value) }} {% endfor %} {% endif %} -{% for frontend_key, frontend_value in frontend_information.items() %} -{{ frontend_key }} = {{ frontend_value }} -{% endfor %} {% endfor %} [buildout]