Merge pull request #63 from zoide/e20b7d11c3bea3aab515527d143e707f800783b6

Fixing boolean comparisons
This commit is contained in:
James Fryman 2013-05-29 09:11:30 -07:00
commit 48370340b8
3 changed files with 7 additions and 7 deletions

View file

@ -124,7 +124,7 @@ define nginx::resource::location (
}
## Create stubs for vHost File Fragment Pattern
if ($ssl_only != 'true') {
if ($ssl_only != true) {
file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-500-${name}":
ensure => $ensure_real,
content => $content_real,
@ -132,7 +132,7 @@ define nginx::resource::location (
}
## Only create SSL Specific locations if $ssl is true.
if ($ssl == 'true') {
if ($ssl == true) {
file {"${nginx::config::nx_temp_dir}/nginx.d/${vhost}-800-${name}-ssl":
ensure => $ensure_real,
content => $content_real,

View file

@ -37,7 +37,7 @@
# ssl_port => 465,
# starttls => 'only',
# xclient => 'off',
# ssl => 'true',
# ssl => true,
# ssl_cert => '/tmp/server.crt',
# ssl_key => '/tmp/server.pem',
# }

View file

@ -52,7 +52,7 @@
# nginx::resource::vhost { 'test2.local':
# ensure => present,
# www_root => '/var/www/nginx-default',
# ssl => 'true',
# ssl => true,
# ssl_cert => '/tmp/server.crt',
# ssl_key => '/tmp/server.pem',
# }
@ -131,8 +131,8 @@ define nginx::resource::vhost (
}
}
if ($ssl == 'true') and ($ssl_port == $listen_port) {
$ssl_only = 'true'
if ($ssl == true) and ($ssl_port == $listen_port) {
$ssl_only = true
}
# Create the default location reference for the vHost
@ -171,7 +171,7 @@ define nginx::resource::vhost (
}
# Create SSL File Stubs if SSL is enabled
if ($ssl == 'true') {
if ($ssl == true) {
file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl":
ensure => $ensure ? {
'absent' => absent,