Merge pull request #1237 from bastelfreak/linter

get rid of topscope variables
voxpupuli · Sep 4, 2018 · 5f0ed59 · 5f0ed59
2 parents 67fa782 + 38f81b4
commit 5f0ed59
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -40,9 +40,9 @@
   $log_dir                                                   = $nginx::params::log_dir,
   $log_group                                                 = $nginx::params::log_group,
   $log_mode                                                  = '0750',
-  Variant[String, Array[String]] $http_access_log            = "${log_dir}/${::nginx::params::http_access_log_file}",
+  Variant[String, Array[String]] $http_access_log            = "${log_dir}/${nginx::params::http_access_log_file}",
   $http_format_log                                           = undef,
-  Variant[String, Array[String]] $nginx_error_log            = "${log_dir}/${::nginx::params::nginx_error_log_file}",
+  Variant[String, Array[String]] $nginx_error_log            = "${log_dir}/${nginx::params::nginx_error_log_file}",
   Nginx::ErrorLogSeverity $nginx_error_log_severity          = 'error',
   $pid                                                       = $nginx::params::pid,
   $proxy_temp_path                                           = $nginx::params::proxy_temp_path,

diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -184,7 +184,7 @@
   Optional[String] $fastcgi                            = undef,
   Optional[String] $fastcgi_index                      = undef,
   Optional[Hash] $fastcgi_param                        = undef,
-  String $fastcgi_params                               = "${::nginx::conf_dir}/fastcgi.conf",
+  String $fastcgi_params                               = "${nginx::conf_dir}/fastcgi.conf",
   Optional[String] $fastcgi_script                     = undef,
   Optional[String] $fastcgi_split_path                 = undef,
   Optional[String] $uwsgi                              = undef,
@@ -283,7 +283,7 @@
     }
   }
 
-  if $ensure == present and $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${::nginx::conf_dir}/uwsgi_params" {
+  if $ensure == present and $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${nginx::conf_dir}/uwsgi_params" {
     file { $uwsgi_params:
       ensure  => present,
       mode    => '0644',

diff --git a/manifests/resource/mailhost.pp b/manifests/resource/mailhost.pp
@@ -135,7 +135,7 @@
     mode  => '0644',
   }
 
-  $config_dir  = "${::nginx::conf_dir}/conf.mail.d"
+  $config_dir  = "${nginx::conf_dir}/conf.mail.d"
   $config_file = "${config_dir}/${name}.conf"
 
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled

diff --git a/manifests/resource/server.pp b/manifests/resource/server.pp
@@ -207,7 +207,7 @@
   Optional[String] $fastcgi                                                      = undef,
   Optional[String] $fastcgi_index                                                = undef,
   $fastcgi_param                                                                 = undef,
-  String $fastcgi_params                                                         = "${::nginx::conf_dir}/fastcgi.conf",
+  String $fastcgi_params                                                         = "${nginx::conf_dir}/fastcgi.conf",
   Optional[String] $fastcgi_script                                               = undef,
   Optional[String] $uwsgi                                                        = undef,
   String $uwsgi_params                                                           = "${nginx::config::conf_dir}/uwsgi_params",
@@ -403,15 +403,15 @@
   # Only try to manage these files if they're the default one (as you presumably
   # usually don't want the default template if you're using a custom file.
 
-  if $fastcgi != undef and !defined(File[$fastcgi_params]) and $fastcgi_params == "${::nginx::conf_dir}/fastcgi.conf" {
+  if $fastcgi != undef and !defined(File[$fastcgi_params]) and $fastcgi_params == "${nginx::conf_dir}/fastcgi.conf" {
     file { $fastcgi_params:
       ensure  => present,
       mode    => '0644',
       content => template('nginx/server/fastcgi.conf.erb'),
     }
   }
 
-  if $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${::nginx::conf_dir}/uwsgi_params" {
+  if $uwsgi != undef and !defined(File[$uwsgi_params]) and $uwsgi_params == "${nginx::conf_dir}/uwsgi_params" {
     file { $uwsgi_params:
       ensure  => present,
       mode    => '0644',

diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -55,7 +55,7 @@
     fail('You must include the nginx base class before using any defined resources')
   }
 
-  $root_group = $::nginx::root_group
+  $root_group = $nginx::root_group
 
   $ensure_real = $ensure ? {
     'absent' => absent,