From afbaf1df1dc8eb79e64354878430530448160913 Mon Sep 17 00:00:00 2001 From: jnguiot <45011516+jnguiot@users.noreply.github.com> Date: Mon, 13 May 2019 18:12:45 +0200 Subject: [PATCH 1/2] MODULES-9083: remove double quotes to allow flags in SSLCARevocationCheck (mod_ssl) --- templates/vhost/_ssl.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/vhost/_ssl.erb b/templates/vhost/_ssl.erb index 7f5767c4cb..4200f78590 100644 --- a/templates/vhost/_ssl.erb +++ b/templates/vhost/_ssl.erb @@ -34,7 +34,7 @@ SSLVerifyDepth <%= @ssl_verify_depth %> <%- end -%> <%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%> - SSLCARevocationCheck "<%= @ssl_crl_check %>" + SSLCARevocationCheck <%= @ssl_crl_check %> <%- end -%> <%- end -%> <%- if @ssl_options -%> From d2bc04605fa09cd1c7493ed62a92d19b0b465129 Mon Sep 17 00:00:00 2001 From: jnguiot <45011516+jnguiot@users.noreply.github.com> Date: Tue, 14 May 2019 09:40:09 +0200 Subject: [PATCH 2/2] MODULES-9083: add unit test --- spec/acceptance/apache_ssl_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/apache_ssl_spec.rb b/spec/acceptance/apache_ssl_spec.rb index 669f54a0af..6195e7e8da 100644 --- a/spec/acceptance/apache_ssl_spec.rb +++ b/spec/acceptance/apache_ssl_spec.rb @@ -50,7 +50,7 @@ class { 'apache': ssl_ca => '/tmp/ssl_ca', ssl_crl_path => '/tmp/ssl_crl_path', ssl_crl => '/tmp/ssl_crl', - ssl_crl_check => 'chain', + ssl_crl_check => 'chain flag', ssl_certs_dir => '/tmp', ssl_protocol => 'test', ssl_cipher => 'test', @@ -83,7 +83,7 @@ class { 'apache': it { is_expected.to contain 'SSLVerifyDepth test' } it { is_expected.to contain 'SSLOptions test test1' } if apache_hash['version'] == '2.4' - it { is_expected.to contain 'SSLCARevocationCheck "chain"' } + it { is_expected.to contain 'SSLCARevocationCheck chain flag' } else it { is_expected.not_to contain 'SSLCARevocationCheck' } end