Skip to content

Commit b1bb343

Browse files
committed
puppet-lint: fix topscope vars
1 parent 6947c26 commit b1bb343

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

manifests/fpm.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
else {
115115
$fpm_override = "reload signal USR2\nmanual"
116116
}
117-
file { "/etc/init/${::php::fpm::service::service_name}.override":
117+
file { "/etc/init/${php::fpm::service::service_name}.override":
118118
content => $fpm_override,
119119
before => Package[$real_package],
120120
}

manifests/global.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# No deep merging required since the settings we have are the global settings.
2222
$real_settings = $settings
2323

24-
::php::config { 'global':
24+
php::config { 'global':
2525
file => $inifile,
2626
config => $real_settings,
2727
}

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
String $log_group = $php::params::fpm_group,
160160
) inherits php::params {
161161

162-
$real_fpm_package = pick($fpm_package, "${package_prefix}${::php::params::fpm_package_suffix}")
162+
$real_fpm_package = pick($fpm_package, "${package_prefix}${php::params::fpm_package_suffix}")
163163

164164
$real_settings = $settings
165165
$real_extensions = $extensions

manifests/pear.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@
2424
# On Amazon Linux the package name is also just 'php-pear'.
2525
# This would normally not be problematic but if you specify a
2626
# package_prefix other than 'php' then it will fail.
27-
$package_name = "php-${::php::params::pear_package_suffix}"
27+
$package_name = "php-${php::params::pear_package_suffix}"
2828
}
2929
else {
3030
case $facts['os']['family'] {
3131
'Debian': {
3232
# Debian is a litte stupid: The pear package is called 'php-pear'
3333
# even though others are called 'php5-fpm' or 'php5-dev'
34-
$package_name = "php-${::php::params::pear_package_suffix}"
34+
$package_name = "php-${php::params::pear_package_suffix}"
3535
}
3636
'FreeBSD': {
3737
# On FreeBSD the package name is just 'pear'.
3838
$package_name = $php::params::pear_package_suffix
3939
}
4040
default: {
4141
# This is the default for all other architectures
42-
$package_name = "${::php::package_prefix}${::php::params::pear_package_suffix}"
42+
$package_name = "${php::package_prefix}${php::params::pear_package_suffix}"
4343
}
4444
}
4545
}

0 commit comments

Comments
 (0)