Skip to content

Commit

Permalink
Merge pull request #1378 from jasonhancock/bug-el7-modulefile
Browse files Browse the repository at this point in the history
Ensure module packages are installed before evaluating conf.d dir
  • Loading branch information
tphoney committed Feb 22, 2016
2 parents 240dff7 + 328cb96 commit ba2f386
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion manifests/mod.pp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@
File[$_loadfile_name],
File["${::apache::conf_dir}/${::apache::params::conf_file}"]
],
default => File[$_loadfile_name],
default => [
File[$_loadfile_name],
File[$::apache::confd_dir],
],
}
# if there are any packages, they should be installed before the associated conf file
Package[$_package] -> File<| title == "${mod}.conf" |>
Expand Down

0 comments on commit ba2f386

Please sign in to comment.