Skip to content

Commit 711ad35

Browse files
5Ub-Z3r05Ub-Z3r0
5Ub-Z3r0
authored and
5Ub-Z3r0
committed
Fixed: removed EPEL configuration, added dependency on stahnma/epel module
1 parent 422ccc7 commit 711ad35

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

Modulefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name 'puppet-pureftpd'
2-
version '1.0.2'
2+
version '1.0.3'
33

44
author '5Ub-Z3r0'
55
license 'GPL v3'
@@ -17,3 +17,7 @@ Requirements:
1717
Todo:
1818
- complete the config_mysql and config_pgsql defines
1919
'
20+
21+
## Add dependencies, if any:
22+
dependency 'stahnma/epel', '>= 0.0.2'
23+

manifests/install.pp

+1-13
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,7 @@
1616
class pureftpd::install {
1717
case $::osfamily{
1818
'RedHat': {
19-
# On RHEL, we require EPEL
20-
package { 'epel-release' :
21-
ensure => 'present',
22-
provider => 'rpm',
23-
source => $::lsbmajdistrelease ? {
24-
'5' => 'http://mirror.uv.es/mirror/fedora-epel/5/i386/epel-release-5-4.noarch.rpm',
25-
'6' => 'http://ftp.tu-chemnitz.de/pub/linux/fedora-epel/6/i386/epel-release-6-7.noarch.rpm'
26-
}
27-
}
28-
package { $pureftpd::params::package_name:
29-
ensure => present,
30-
require => Package ['epel-release']
31-
}
19+
include epel
3220
}
3321
'Debian': {
3422
package { $pureftpd::params::package_name:

0 commit comments

Comments
 (0)