Commit 029f8a86 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

apache-frontend: fix double publication bug

parent 3e4b3561
......@@ -67,7 +67,7 @@ mode = 0644
[template-apache-frontend]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-frontend.cfg
md5sum = 5388e77d520135b7491f1aeddac5f4e0
md5sum = 986988ed3a357f87fc023e14d87dcc5c
output = ${buildout:directory}/template-apache-frontend.cfg
mode = 0644
......@@ -80,7 +80,7 @@ mode = 0644
[template-slave-list]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
md5sum = c896e60c95ca387a75a163d817155d98
md5sum = 1c2a47e7e2aa58b4f350ed29ab1a98fe
mode = 640
[template-slave-configuration]
......
......@@ -175,7 +175,7 @@ extra-context =
section logrotate_dict logrotate
section frontend_configuration frontend-configuration
section apache_configuration apache-configuration
section connection_information_dict publish-connection-informations
key monitor_url monitor-parameters:url
[dynamic-custom-group-template-slave-list]
< = jinja2-template-base
......
......@@ -237,10 +237,7 @@ private-ipv4 = {{ local_ipv4 }}
{% if extra_slave_instance_list -%}
slave-instance-information-list = {{ json_module.dumps(slave_instance_information_list) }}
{% endif -%}
{% do connection_information_dict.pop('recipe') %}
{% for key, value in connection_information_dict.iteritems() -%}
{{ key }} = {{ value }}
{% endfor %}
monitor_url = {{ monitor_url }}
{% do part_list.append('cached-rewrite-rules') -%}
[cached-rewrite-rules]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment