diff --git a/manifests/config.pp b/manifests/config.pp index 89d75d27b..f22b3a689 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -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', diff --git a/manifests/package.pp b/manifests/package.pp index de6ef4fa1..74885b2b5 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -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': } diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp index 962c86695..b87e3c0be 100644 --- a/manifests/package/debian.pp +++ b/manifests/package/debian.pp @@ -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) diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp index c4cb3a6ab..4cc34eea9 100644 --- a/manifests/package/redhat.pp +++ b/manifests/package/redhat.pp @@ -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 diff --git a/manifests/package/suse.pp b/manifests/package/suse.pp index b10587a5e..0c044b09f 100644 --- a/manifests/package/suse.pp +++ b/manifests/package/suse.pp @@ -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', diff --git a/manifests/params.pp b/manifests/params.pp index 36eb06b23..8ecf10154 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/manifests/service.pp b/manifests/service.pp index e02c35be4..9ec899395 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -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,