diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-11 19:45:53 +0000 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-05-11 19:45:53 +0000 |
| commit | 240fa02355ed56838e5662d971fd693b79e94fee (patch) | |
| tree | ee9fb9ec27206f30dd2abb61ef98ac96c02f0da7 | |
| parent | 3d437b37d62319c47d355998ab61483cd3ac1da3 (diff) | |
| parent | b4a7f74268b71c3c63f460b3c86287aa0806c237 (diff) | |
Merge branch 'fix_module_ordering' into 'master'
Fix module ordering
see https://gitlab.com/shared-puppet-modules-group/apache/issues/6
See merge request !2
| -rw-r--r-- | manifests/debian/module.pp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/manifests/debian/module.pp b/manifests/debian/module.pp index 4c100fa..252948f 100644 --- a/manifests/debian/module.pp +++ b/manifests/debian/module.pp @@ -1,3 +1,4 @@ +# install/remove apache module on debian/ubuntu systems define apache::debian::module( $ensure = present, $package_name = 'absent' @@ -6,30 +7,33 @@ define apache::debian::module( if ($package_name != 'absent') { package { $package_name: - ensure => $ensure, - notify => Service['apache'], - require => Package['apache'], + ensure => $ensure, + notify => Service['apache'], + require => [ File['modules_dir'], Package['apache'] ], } } case $ensure { 'absent','purged': { exec { "/usr/sbin/a2dismod ${name}": - onlyif => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\ + onlyif => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\ && [ ${modules_dir}-enabled/${name}.load -ef ${modules_dir}-available/${name}.load ]'", - notify => Service['apache'], + notify => Service['apache'], require => Package['apache'], } } default : { exec { "/usr/sbin/a2enmod ${name}": - unless => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\ + unless => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\ && [ ${modules_dir}-enabled/${name}.load -ef ${modules_dir}-available/${name}.load ]'", - notify => Service['apache'], - require => $package_name ? { + notify => Service['apache'], + require => [ + File['modules_dir'], + $package_name ? { 'absent' => Package['apache'], - default => Package[['apache',$package_name]], - }, + default => Package[['apache',$package_name]], + } + ], } } } |