Commit 95b08d34 authored by Łukasz Nowak's avatar Łukasz Nowak

XXX: Drop configuration parameter from instance slave list

parent 321d48b1
...@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68 ...@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend] [profile-frontend]
filename = instance-frontend.cfg.in filename = instance-frontend.cfg.in
md5sum = a051d9f32c1ea2bf5b67f4012f772124 md5sum = 00b7120eb652e6e4d04046591b156e31
[profile-master] [profile-master]
filename = instance-master.cfg.in filename = instance-master.cfg.in
...@@ -30,7 +30,7 @@ md5sum = 291f73c3782040d02fd56a46f61c201b ...@@ -30,7 +30,7 @@ md5sum = 291f73c3782040d02fd56a46f61c201b
[profile-slave-list] [profile-slave-list]
filename = instance-slave-list.cfg.in filename = instance-slave-list.cfg.in
md5sum = e0e462bd94d2b468c88ff69c2156d0f5 md5sum = 348d6bd55ff9d94b634089a6c074695d
[profile-master-publish-slave-information] [profile-master-publish-slave-information]
filename = instance-master-publish-slave-information.cfg.in filename = instance-master-publish-slave-information.cfg.in
......
This diff is collapsed.
...@@ -86,7 +86,7 @@ context = ...@@ -86,7 +86,7 @@ context =
{%- do slave_instance.__setitem__('path', slave_instance.get('path', SLAVE_DEFAULTS['path']).strip('/')) %} {%- do slave_instance.__setitem__('path', slave_instance.get('path', SLAVE_DEFAULTS['path']).strip('/')) %}
{#- Manage ciphers #} {#- Manage ciphers #}
{%- set slave_cipher_list = [] %} {%- set slave_cipher_list = [] %}
{%- for cipher in slave_instance.get('ciphers', configuration['ciphers']).strip().split() %} {%- for cipher in slave_instance.get('ciphers', dynamic_profile_configuration['global-ciphers']).strip().split() %}
{%- do slave_cipher_list.append(CIPHER_TRANSLATION_DICT.get(cipher, cipher)) %} {%- do slave_cipher_list.append(CIPHER_TRANSLATION_DICT.get(cipher, cipher)) %}
{%- endfor %} {%- endfor %}
{%- do slave_instance.__setitem__('ciphers', ':'.join(slave_cipher_list)) %} {%- do slave_instance.__setitem__('ciphers', ':'.join(slave_cipher_list)) %}
......
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