Merge pull request #1652 from wdpypere/haproxy

ncm-metaconfig: haproxy - add ciphersuites config options
quattor · Feb 13, 2024 · 767c1b3 · 767c1b3
2 parents 14a5f7d + 5444bee
commit 767c1b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
 };