Merge pull request #158 from miguno/master

Fix RHEL installation support
voxpupuli · Oct 16, 2013 · a2083e4 · a2083e4
2 parents 65465b2 + 291d5d2
commit a2083e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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,
   }
 
 }