From e20b7d11c3bea3aab515527d143e707f800783b6 Mon Sep 17 00:00:00 2001 From: do Date: Sun, 26 May 2013 14:24:40 +0200 Subject: [PATCH] fixing boolean comparisons --- manifests/resource/location.pp | 4 ++-- manifests/resource/mailhost.pp | 2 +- manifests/resource/vhost.pp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp index 55ca8f9aa..8e9caa68d 100644 --- a/manifests/resource/location.pp +++ b/manifests/resource/location.pp @@ -124,7 +124,7 @@ } ## 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 @@ } ## 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, diff --git a/manifests/resource/mailhost.pp b/manifests/resource/mailhost.pp index d82480d4f..dc0de601b 100644 --- a/manifests/resource/mailhost.pp +++ b/manifests/resource/mailhost.pp @@ -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', # } diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp index cb0435e8b..0446f5545 100644 --- a/manifests/resource/vhost.pp +++ b/manifests/resource/vhost.pp @@ -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 @@ } } - 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 @@ } # 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,