Merge pull request #53 from cruelsmith/main

Remove general yumrepo ordering and fix ordering for acceptance tests only
markt-de · Sep 25, 2024 · 133ae4d · 133ae4d
2 parents 0b2f950 + 82673af
commit 133ae4d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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
@@ -6,6 +6,7 @@
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
         include epel
+        Class['epel'] -> Class['proftpd']
       }
       class { 'proftpd': }
       EOS