Commit bf3f498d authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Matevz Golob

caddy-frontend: Always fill-in key download url

Kedifa requires some time to process new slave, and during that time the key
download URL is not available, but as it is required for proper mapping file,
use some url to mimic it.
parent bcf05f74
...@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795 ...@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = e0d0c9fc7d4bf95dac580bbc1d2a4d93 md5sum = be47649fba6b44e136c3a8eb538443f3
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
......
...@@ -32,6 +32,8 @@ create = true ...@@ -32,6 +32,8 @@ create = true
{% if master_key_download_url %} {% if master_key_download_url %}
{% do kedifa_updater_mapping.append((master_key_download_url, master_certificate, apache_certificate)) %} {% do kedifa_updater_mapping.append((master_key_download_url, master_certificate, apache_certificate)) %}
{% else %}
{% do kedifa_updater_mapping.append(('https://notreadyyet', master_certificate, apache_certificate)) %}
{% endif %} {% endif %}
{% if slave_kedifa_information %} {% if slave_kedifa_information %}
...@@ -55,7 +57,7 @@ output = {{ plugin_directory }}/${:name} ...@@ -55,7 +57,7 @@ output = {{ plugin_directory }}/${:name}
{% if slave_kedifa %} {% if slave_kedifa %}
{% set key_download_url = slave_kedifa.get('key-download-url') %} {% set key_download_url = slave_kedifa.get('key-download-url') %}
{% else %} {% else %}
{% set key_download_url = '' %} {% set key_download_url = 'http://notreadyyet' %}
{% endif %} {% endif %}
{% set slave_type = slave_instance.get('type', '') %} {% set slave_type = slave_instance.get('type', '') %}
{% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %} {% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %}
......
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