Merge pull request #63 from zoide/e20b7d11c3bea3aab515527d143e707f800…

…783b6 Fixing boolean comparisons
voxpupuli · May 29, 2013 · 4837034 · 4837034
2 parents f032357 + e20b7d1
commit 4837034
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -124,15 +124,15 @@
   }
 
   ## 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,
     }
   }
 
   ## 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
@@ -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
@@ -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,