From 7714251f6740047da54ac9175f1859fa1d1faf99 Mon Sep 17 00:00:00 2001
From: Maarten Dirkse <mdirkse@bol.com>
Date: Thu, 13 Jun 2013 18:44:15 +0200
Subject: [PATCH] Removed various puppet-lint warnings and fixed a typo

---
 manifests/init.pp           |  2 +-
 manifests/package/debian.pp |  4 ++--
 manifests/resource/vhost.pp | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 6ff3188..ffe72f5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -40,7 +40,7 @@ class nginx (
   $proxy_cache_max_size   = $nginx::params::nx_proxy_cache_max_size,
   $proxy_cache_inactive   = $nginx::params::nx_proxy_cache_inactive,
   $configtest_enable      = $nginx::params::nx_configtest_enable,
-  $service_restart        = $nginx::params::nx_service_restrart,
+  $service_restart        = $nginx::params::nx_service_restart,
   $mail                   = $nginx::params::nx_mail,
   $server_tokens          = $nginx::params::nx_server_tokens
 ) inherits nginx::params {
diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
index 97314ef..48832db 100644
--- a/manifests/package/debian.pp
+++ b/manifests/package/debian.pp
@@ -17,7 +17,7 @@ class nginx::package::debian {
   $operatingsystem_lowercase = inline_template('<%= operatingsystem.downcase %>')
 
   package { 'nginx':
-    ensure => present,
+    ensure  => present,
     require => Anchor['nginx::apt_repo'],
   }
 
@@ -34,7 +34,7 @@ class nginx::package::debian {
   }
 
   exec { 'add_nginx_apt_key':
-    command   => "/usr/bin/wget http://nginx.org/keys/nginx_signing.key -O - | /usr/bin/apt-key add -",
+    command   => '/usr/bin/wget http://nginx.org/keys/nginx_signing.key -O - | /usr/bin/apt-key add -',
     unless    => '/usr/bin/apt-key list | /bin/grep -q nginx',
     before    => Anchor['nginx::apt_repo'],
   }
diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
index 0446f55..e83466b 100644
--- a/manifests/resource/vhost.pp
+++ b/manifests/resource/vhost.pp
@@ -42,7 +42,7 @@
 #     put after everything else inside vhost
 #   [*rewrite_to_https*]        - Adds a server directive and rewrite rule to
 #      rewrite to ssl
-#   [*include_files*] 		      - Adds include files to vhost
+#   [*include_files*]           - Adds include files to vhost
 #
 # Actions:
 #
@@ -84,14 +84,14 @@ define nginx::resource::vhost (
   $server_name            = [$name],
   $www_root               = undef,
   $rewrite_www_to_non_www = false,
-  $rewrite_to_https 	  = undef,
+  $rewrite_to_https       = undef,
   $location_cfg_prepend   = undef,
   $location_cfg_append    = undef,
   $try_files              = undef,
   $auth_basic             = undef,
   $auth_basic_user_file   = undef,
   $vhost_cfg_append       = undef,
-  $include_files		  = undef
+  $include_files          = undef
 ) {
 
   File {
@@ -173,7 +173,7 @@ define nginx::resource::vhost (
   # Create SSL File Stubs if SSL is enabled
   if ($ssl == true) {
     file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-700-ssl":
-      ensure => $ensure ? {
+      ensure  => $ensure ? {
         'absent' => absent,
         default  => 'file',
       },
@@ -181,7 +181,7 @@ define nginx::resource::vhost (
       notify  => Class['nginx::service'],
     }
     file { "${nginx::config::nx_temp_dir}/nginx.d/${name}-999-ssl":
-      ensure => $ensure ? {
+      ensure  => $ensure ? {
         'absent' => absent,
         default  => 'file',
       },