Skip to content

Commit

Permalink
Fix RHEL installation support
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael G. Noll committed Oct 16, 2013
1 parent 562ac20 commit ec6bd98
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions manifests/package.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}
Expand Down
11 changes: 6 additions & 5 deletions manifests/package/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down Expand Up @@ -52,7 +53,7 @@
gpgcheck => '1',
priority => '1',
gpgkey => 'http://nginx.org/keys/nginx_signing.key',
before => Package[$redhat_packages],
before => Package[$package_name],
}
}
}
Expand All @@ -66,8 +67,8 @@
}
}

package { $redhat_packages:
ensure => $nginx::package_ensure,
package { $package_name:
ensure => $package_ensure,
}

}

0 comments on commit ec6bd98

Please sign in to comment.