(CAT-1281) - Support to add cipher with respective ssl protocol

puppetlabs · Aug 10, 2023 · 30ae23e · 30ae23e
1 parent 7dc4d01
commit 30ae23e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/templates/mod/ssl.conf.erb b/templates/mod/ssl.conf.erb
@@ -33,7 +33,13 @@
   SSLStaplingReturnResponderErrors <%= scope.call_function('apache::bool2httpd', [@ssl_stapling_return_errors]) %>
   <%- end -%>
   SSLStaplingCache "shmcb:<%= @_stapling_cache %>"
+  <%- if @ssl_cipher.kind_of?(Hash) -%>
+    <%- @ssl_cipher.map do |protocol, cipher| -%>
+  SSLCipherSuite <%= protocol %> <%= cipher %>
+    <%- end -%>
+  <%- else -%>
   SSLCipherSuite <%= @ssl_cipher %>
+  <%- end -%>
 <% if not @ssl_protocol.empty? -%>
   SSLProtocol <%= @ssl_protocol.compact.join(' ') %>
 <% end -%>

diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb
@@ -15,6 +15,10 @@
   <%- if @ssl_cipher -%>
   <%- if @ssl_cipher.kind_of?(String) -%>
   SSLCipherSuite          <%= @ssl_cipher %>
+  <%- elsif @ssl_cipher.kind_of?(Hash) -%>
+    <%- @ssl_cipher.map do |protocol, cipher| -%>
+  SSLCipherSuite <%= protocol %> <%= cipher%>
+    <%- end -%>
   <%- else -%>
   SSLCipherSuite          <%= @ssl_cipher.flatten.compact.join(':') %>
   <%- end -%>