diff --git a/ncm-metaconfig/src/main/metaconfig/haproxy/global.tt b/ncm-metaconfig/src/main/metaconfig/haproxy/global.tt index 9b334ebf39..52f5669b28 100644 --- a/ncm-metaconfig/src/main/metaconfig/haproxy/global.tt +++ b/ncm-metaconfig/src/main/metaconfig/haproxy/global.tt @@ -2,7 +2,7 @@ log [% CCM.unescape(pair.key) %] [% pair.value.join(' ') %] [% END %] [% FOREACH option IN global.config.pairs -%] -[% IF ( option.key == 'ssl-default-bind-ciphers' || option.key == 'ssl-default-server-ciphers' ) -%] +[% IF ( option.key == 'ssl-default-bind-ciphers' || option.key == 'ssl-default-server-ciphers' || option.key == 'ssl-default-bind-ciphersuites' || option.key == 'ssl-default-server-ciphersuites' ) -%] [% option.key %] [% option.value.join(':') %] [% ELSIF ( option.key == 'ssl-default-bind-options' || option.key == 'ssl-default-server-options') -%] [% option.key %] [% option.value.join(' ') %] diff --git a/ncm-metaconfig/src/main/metaconfig/haproxy/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/haproxy/pan/schema.pan index 31499656f2..4334a42711 100644 --- a/ncm-metaconfig/src/main/metaconfig/haproxy/pan/schema.pan +++ b/ncm-metaconfig/src/main/metaconfig/haproxy/pan/schema.pan @@ -25,8 +25,10 @@ type haproxy_service_global_config = { 'ssl-default-bind-ciphers' ? string_non_whitespace[] 'ssl-default-bind-options' ? string[] + 'ssl-default-bind-ciphersuites' ? string_non_whitespace[] 'ssl-default-server-ciphers' ? string_non_whitespace[] 'ssl-default-server-options' ? string[] + 'ssl-default-server-ciphersuites' ? string_non_whitespace[] 'ssl-dh-param-file' ? absolute_file_path };