Skip to content

Commit

Permalink
(MODULES-1457) apache::vhost: SSLCACertificatePath can't be unset
Browse files Browse the repository at this point in the history
The SSLCACertificatePath is always set. The check for @ssl_certs_dir only
covers "undef". As there is a default value in ::apache::params for
ssl_certs_dir it needs to be overriden with an empty string.

Right now the _ssl.erb template outputs 'SSLCACertificatePath ""' for an empty
string, which triggers a failing reload of httpd.

This patch just adds a "&& @ssl_certs_dir != ''" to the condition.

On a Puppet master passenger vhost it's probably  security relevant setting,
as it enables all system CA signed certificates access.

Related patch: puppetlabs/puppetlabs-apache#787
  • Loading branch information
vinzent committed Oct 24, 2014
1 parent 0b0a226 commit dd69adc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion templates/vhost/_ssl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%- if @ssl_chain -%>
SSLCertificateChainFile "<%= @ssl_chain %>"
<%- end -%>
<%- if @ssl_certs_dir -%>
<%- if @ssl_certs_dir && @ssl_certs_dir != '' -%>
SSLCACertificatePath "<%= @ssl_certs_dir %>"
<%- end -%>
<%- if @ssl_ca -%>
Expand Down

0 comments on commit dd69adc

Please sign in to comment.