Fixed: removed EPEL configuration, added dependency on stahnma/epel m…

…odule
jhoblitt · Sep 5, 2012 · 711ad35 · 711ad35
1 parent 422ccc7
commit 711ad35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name 'puppet-pureftpd'
-version '1.0.2'
+version '1.0.3'
 
 author '5Ub-Z3r0'
 license 'GPL v3'
@@ -17,3 +17,7 @@ Requirements:
 Todo:
 - complete the config_mysql and config_pgsql defines
 '
+
+## Add dependencies, if any:
+dependency 'stahnma/epel', '>= 0.0.2'
+
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -16,19 +16,7 @@
 class pureftpd::install {
   case $::osfamily{
     'RedHat': {
-      # On RHEL, we require EPEL
-      package { 'epel-release' :
-        ensure   => 'present',
-        provider => 'rpm',
-        source   => $::lsbmajdistrelease ? {
-          '5' => 'http://mirror.uv.es/mirror/fedora-epel/5/i386/epel-release-5-4.noarch.rpm',
-          '6' => 'http://ftp.tu-chemnitz.de/pub/linux/fedora-epel/6/i386/epel-release-6-7.noarch.rpm'
-        }
-      }
-      package { $pureftpd::params::package_name:
-        ensure  => present,
-        require => Package ['epel-release']
-      }
+      include epel
     }
     'Debian': {
       package { $pureftpd::params::package_name: