Merge pull request #1946 from jnguiot/ssl_crl_check_flags2

MODULES-9083: remove double quotes to allow flags in SSLCARevocationCheck
puppetlabs · Sep 11, 2019 · 497fbd6 · 497fbd6
2 parents a214c09 + d2bc046
commit 497fbd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git 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 -%>