Merge pull request #327 from hundredacres/master

Puppet-lint fixes
voxpupuli · Jun 4, 2014 · 3c7b544 · 3c7b544
2 parents 0030399 + f0f00c6
commit 3c7b544
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 31 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -19,7 +19,7 @@
   $conf_template                  = $nginx::params::nx_conf_template,
   $events_use                     = $nginx::params::nx_events_use,
   $fastcgi_cache_inactive         = $nginx::params::nx_fastcgi_cache_inactive,
-  $fastcgi_cache_key  	          = $nginx::params::nx_fastcgi_cache_key,
+  $fastcgi_cache_key              = $nginx::params::nx_fastcgi_cache_key,
   $fastcgi_cache_keys_zone        = $nginx::params::nx_fastcgi_cache_keys_zone,
   $fastcgi_cache_levels           = $nginx::params::nx_fastcgi_cache_levels,
   $fastcgi_cache_max_size         = $nginx::params::nx_fastcgi_cache_max_size,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -118,10 +118,10 @@
   validate_string($fastcgi_cache_max_size)
   validate_string($fastcgi_cache_inactive)
   if ($fastcgi_cache_key != false) {
-	validate_string($fastcgi_cache_key)
+    validate_string($fastcgi_cache_key)
   }
   if ($fastcgi_cache_use_stale != false) {
-  	validate_string($fastcgi_cache_use_stale)
+    validate_string($fastcgi_cache_use_stale)
   }
 
   validate_bool($configtest_enable)

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -60,8 +60,8 @@
         package_name   => $package_name,
         package_source => $package_source,
         package_ensure => $package_ensure,
-        require => Anchor['nginx::package::begin'],
-        before  => Anchor['nginx::package::end'],
+        require        => Anchor['nginx::package::begin'],
+        before         => Anchor['nginx::package::end'],
       }
     }
     default: {

diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -281,7 +281,6 @@
 
   ## Create stubs for vHost File Fragment Pattern
   if ($ssl_only != true) {
-
     $tmpFile=md5("${vhost_sanitized}-${priority}-${location_sanitized}")
 
     concat::fragment { "${tmpFile}":
@@ -294,11 +293,9 @@
 
   ## Only create SSL Specific locations if $ssl is true.
   if ($ssl == true) {
-
     $ssl_priority = $priority + 300
 
     $sslTmpFile=md5("${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl")
-
     concat::fragment {"${sslTmpFile}":
       ensure  => present,
       target  => $config_file,

diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -397,30 +397,30 @@
   if $use_default_location == true {
     # Create the default location reference for the vHost
     nginx::resource::location {"${name_sanitized}-default":
-      ensure              => $ensure,
-      vhost               => $name_sanitized,
-      ssl                 => $ssl,
-      ssl_only            => $ssl_only,
-      location            => '/',
-      location_allow      => $location_allow,
-      location_deny       => $location_deny,
-      proxy               => $proxy,
-      proxy_read_timeout  => $proxy_read_timeout,
+      ensure                => $ensure,
+      vhost                 => $name_sanitized,
+      ssl                   => $ssl,
+      ssl_only              => $ssl_only,
+      location              => '/',
+      location_allow        => $location_allow,
+      location_deny         => $location_deny,
+      proxy                 => $proxy,
+      proxy_read_timeout    => $proxy_read_timeout,
       proxy_connect_timeout => $proxy_connect_timeout,
-      proxy_cache         => $proxy_cache,
-      proxy_cache_valid   => $proxy_cache_valid,
-      proxy_method        => $proxy_method,
-      proxy_set_body      => $proxy_set_body,
-      fastcgi             => $fastcgi,
-      fastcgi_params      => $fastcgi_params,
-      fastcgi_script      => $fastcgi_script,
-      try_files           => $try_files,
-      www_root            => $www_root,
-      autoindex           => $autoindex,
-      index_files         => [],
-      location_custom_cfg => $location_custom_cfg,
-      notify              => Class['nginx::service'],
-      rewrite_rules       => $rewrite_rules,
+      proxy_cache           => $proxy_cache,
+      proxy_cache_valid     => $proxy_cache_valid,
+      proxy_method          => $proxy_method,
+      proxy_set_body        => $proxy_set_body,
+      fastcgi               => $fastcgi,
+      fastcgi_params        => $fastcgi_params,
+      fastcgi_script        => $fastcgi_script,
+      try_files             => $try_files,
+      www_root              => $www_root,
+      autoindex             => $autoindex,
+      index_files           => [],
+      location_custom_cfg   => $location_custom_cfg,
+      notify                => Class['nginx::service'],
+      rewrite_rules         => $rewrite_rules,
     }
     $root = undef
   } else {