diff --git a/manifests/init.pp b/manifests/init.pp index 38051f4..5980c65 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -140,9 +140,10 @@ Optional[Stdlib::Filesource] $authgroupfile_source = undef, Optional[Stdlib::Absolutepath] $prefix = undef, ) { - class { 'proftpd::install': } - -> class { 'proftpd::config': } - ~> class { 'proftpd::service': } + contain proftpd::install + contain proftpd::config + contain proftpd::service + Class['proftpd::install'] -> Class['proftpd::config'] ~> Class['proftpd::service'] if $load_modules { create_resources(proftpd::module, $load_modules, {}) diff --git a/manifests/install.pp b/manifests/install.pp index 3e14d10..33902a2 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -3,10 +3,6 @@ class proftpd::install { assert_private() - if $facts['os']['family'] == 'RedHat' { - Yumrepo <| |> -> Package <| |> - } - if $proftpd::package_manage { package { $proftpd::packages: ensure => $proftpd::package_ensure, diff --git a/spec/acceptance/proftpd_spec.rb b/spec/acceptance/proftpd_spec.rb index 051e019..cc7a62a 100644 --- a/spec/acceptance/proftpd_spec.rb +++ b/spec/acceptance/proftpd_spec.rb @@ -6,6 +6,7 @@ pp = <<-EOS if $facts['os']['family'] == 'RedHat' { include epel + Class['epel'] -> Class['proftpd'] } class { 'proftpd': } EOS