From c3646689f611dd1cbcea7cd863b048d2fdf04030 Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:50:54 -0500 Subject: [PATCH 1/7] Update config.pp --- manifests/config.pp | 4 ---- 1 file changed, 4 deletions(-) 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', From 04520c7692eb9009cf5f26dc90f58364fe5a1698 Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:52:12 -0500 Subject: [PATCH 2/7] Update package.pp --- manifests/package.pp | 4 ---- 1 file changed, 4 deletions(-) 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': } From 6a425e43654f9f51167d1851eb051ea10646c2af Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:52:26 -0500 Subject: [PATCH 3/7] Update params.pp --- manifests/params.pp | 4 ---- 1 file changed, 4 deletions(-) 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' From 28018f5d350bd23be8a29dbb87c5aba3f6238979 Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:52:40 -0500 Subject: [PATCH 4/7] Update service.pp --- manifests/service.pp | 4 ---- 1 file changed, 4 deletions(-) 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, From 94ad2f32675658aa398605c061042f6fe181875a Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:53:41 -0500 Subject: [PATCH 5/7] Update debian.pp --- manifests/package/debian.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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) From 338d3d8b2fc7d2b8ada9d2855807c7c455e3c163 Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:53:51 -0500 Subject: [PATCH 6/7] Update redhat.pp --- manifests/package/redhat.pp | 4 ---- 1 file changed, 4 deletions(-) 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 From 364e2865aa2b2200c3d886c5b2668d55fea7d3c5 Mon Sep 17 00:00:00 2001 From: James Fryman Date: Thu, 27 Mar 2014 16:54:05 -0500 Subject: [PATCH 7/7] Update suse.pp --- manifests/package/suse.pp | 4 ---- 1 file changed, 4 deletions(-) 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',