Skip to content

Commit

Permalink
Merge pull request #283 from jfryman/remove-deprecation-warnings
Browse files Browse the repository at this point in the history
Remove Deprecation Warnings
  • Loading branch information
James Fryman committed Mar 27, 2014
2 parents ac0f4ca + 364e286 commit cdbcca6
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 28 deletions.
4 changes: 0 additions & 4 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
$proxy_conf_template = $nginx::params::nx_proxy_conf_template,
) inherits nginx::params {

if $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}

File {
owner => 'root',
group => 'root',
Expand Down
4 changes: 0 additions & 4 deletions manifests/package.pp
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
$manage_repo = true,
) {

if $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}

anchor { 'nginx::package::begin': }
anchor { 'nginx::package::end': }

Expand Down
5 changes: 1 addition & 4 deletions manifests/package/debian.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@
$package_source = 'nginx',
$package_ensure = 'present'
) {

if $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}


$distro = downcase($::operatingsystem)

Expand Down
4 changes: 0 additions & 4 deletions manifests/package/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
$package_name = 'nginx',
) {

if $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}

case $::operatingsystem {
'fedora': {
# nginx.org does not supply RPMs for fedora
Expand Down
4 changes: 0 additions & 4 deletions manifests/package/suse.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
# This class file is not called directly
class nginx::package::suse {

if $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}

$suse_packages = [
'nginx-0.8', 'apache2', 'apache2-itk', 'apache2-utils', 'gd', 'libapr1',
'libapr-util1', 'libjpeg62', 'libpng14-14', 'libxslt', 'rubygem-daemon_controller',
Expand Down
4 changes: 0 additions & 4 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
# This class file is not called directly
class nginx::params {

if $caller_module_name != undef and $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}

$nx_temp_dir = '/tmp'
$nx_run_dir = '/var/nginx'

Expand Down
4 changes: 0 additions & 4 deletions manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
$service_restart = $nginx::service_restart,
$service_ensure = $nginx::service_ensure,
) {

if $caller_module_name != $module_name {
warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
}

$service_enable = $service_ensure ? {
running => true,
Expand Down

0 comments on commit cdbcca6

Please sign in to comment.