Skip to content

Commit 497fbd6

Browse files
authored
Merge pull request #1946 from jnguiot/ssl_crl_check_flags2
MODULES-9083: remove double quotes to allow flags in SSLCARevocationCheck
2 parents a214c09 + d2bc046 commit 497fbd6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spec/acceptance/apache_ssl_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class { 'apache':
5050
ssl_ca => '/tmp/ssl_ca',
5151
ssl_crl_path => '/tmp/ssl_crl_path',
5252
ssl_crl => '/tmp/ssl_crl',
53-
ssl_crl_check => 'chain',
53+
ssl_crl_check => 'chain flag',
5454
ssl_certs_dir => '/tmp',
5555
ssl_protocol => 'test',
5656
ssl_cipher => 'test',
@@ -83,7 +83,7 @@ class { 'apache':
8383
it { is_expected.to contain 'SSLVerifyDepth test' }
8484
it { is_expected.to contain 'SSLOptions test test1' }
8585
if apache_hash['version'] == '2.4'
86-
it { is_expected.to contain 'SSLCARevocationCheck "chain"' }
86+
it { is_expected.to contain 'SSLCARevocationCheck chain flag' }
8787
else
8888
it { is_expected.not_to contain 'SSLCARevocationCheck' }
8989
end

templates/vhost/_ssl.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
SSLVerifyDepth <%= @ssl_verify_depth %>
3535
<%- end -%>
3636
<%- if @ssl_crl_check && scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
37-
SSLCARevocationCheck "<%= @ssl_crl_check %>"
37+
SSLCARevocationCheck <%= @ssl_crl_check %>
3838
<%- end -%>
3939
<%- end -%>
4040
<%- if @ssl_options -%>

0 commit comments

Comments
 (0)