opendev
/
puppet-drupal
Code Issues Proposed changes

Fix ssl file logic 

The default values for the $ssl_*_contents parameters is undef, so
checking whether they match empty string is not sensible. Fix the
conditionals to check for the case when the user has left the value
unset.

It is reasonable to conditionally not create these certificate files
even when $site_ssl_enabled is set because the path variables may be
set to a snakeoil cert.

Change-Id: I274dbe80a0547336601c12c4e876ba9591798996
This commit is contained in:
Colleen Murphy 2015-10-15 12:58:56 -07:00
parent 9121247258
commit c67a4231f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -98,7 +98,7 @@ class drupal (
include ::httpd::ssl
# site x509 certificate
if $site_ssl_cert_file_contents != '' {
if $site_ssl_cert_file_contents != undef {
file { $site_ssl_cert_file:
owner => 'root',
group => 'root',
@ -109,7 +109,7 @@ class drupal (
}
# site ssl key
if $site_ssl_key_file_contents != '' {
if $site_ssl_key_file_contents != undef {
file { $site_ssl_key_file:
owner => 'root',
group => 'root',
@ -120,7 +120,7 @@ class drupal (
}
# site ca certificates file
if $site_ssl_chain_file_contents != '' {
if $site_ssl_chain_file_contents != undef {
file { $site_ssl_chain_file:
owner => 'root',
group => 'root',