From 291d5d25322cbe81226f3210dbf5a14567eb1a32 Mon Sep 17 00:00:00 2001 From: "Michael G. Noll" Date: Wed, 16 Oct 2013 16:02:29 +0200 Subject: [PATCH] Fix RHEL installation support --- manifests/package.pp | 3 +-- manifests/package/redhat.pp | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/package.pp b/manifests/package.pp index 4b2fb42b9..ec81e7833 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -26,9 +26,8 @@ 'redhat': { class { 'nginx::package::redhat': manage_repo => $manage_repo, - package_name => $package_name, - package_source => $package_source, package_ensure => $package_ensure, + package_name => $package_name, require => Anchor['nginx::package::begin'], before => Anchor['nginx::package::end'], } diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp index 342654cd6..ad4dcb37f 100644 --- a/manifests/package/redhat.pp +++ b/manifests/package/redhat.pp @@ -14,9 +14,10 @@ # # This class file is not called directly class nginx::package::redhat ( - $manage_repo = true + $manage_repo = true, + $package_ensure = 'present', + $package_name = 'nginx', ) { - $redhat_packages = ['nginx', 'gd', 'libXpm', 'libxslt'] case $::operatingsystem { 'fedora': { @@ -52,7 +53,7 @@ gpgcheck => '1', priority => '1', gpgkey => 'http://nginx.org/keys/nginx_signing.key', - before => Package[$redhat_packages], + before => Package[$package_name], } } } @@ -66,8 +67,8 @@ } } - package { $redhat_packages: - ensure => $nginx::package_ensure, + package { $package_name: + ensure => $package_ensure, } }